From 4d59f79bd3993c59cd04707db8f95787554b3a63 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 12 Feb 2020 20:18:00 +0000 Subject: tdf#130623 owner of FieldControl needs to set its allocation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit which works fine automatically when its in a dialog (copy table) but not automatically when hosted inside the design view this will make the gen case work in master, and the gen and gtk case work in 6-4 Change-Id: I530cfa0a7e1f5b62c6812ffde255c1edf478930d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88499 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit 96018929add55cff71a036be3a67df385b023471) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88694 Reviewed-by: Xisco Faulí Reviewed-by: Thorsten Behrens Tested-by: Michael Stahl --- dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx') diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx index b43f8d1fa841..47874ff5bcc2 100644 --- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx +++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx @@ -19,6 +19,7 @@ #ifndef INCLUDED_DBACCESS_SOURCE_UI_TABLEDESIGN_FIELDDESCGENWIN_HXX #define INCLUDED_DBACCESS_SOURCE_UI_TABLEDESIGN_FIELDDESCGENWIN_HXX +#include #include #include @@ -33,6 +34,10 @@ namespace dbaui { VclPtr m_pFieldControl; + Idle maLayoutIdle; + + DECL_LINK(ImplHandleLayoutTimerHdl, Timer*, void); + protected: virtual void Resize() override; @@ -41,6 +46,8 @@ namespace dbaui virtual ~OFieldDescGenWin() override; virtual void dispose() override; + virtual void queue_resize(StateChangedType eReason = StateChangedType::Layout) override; + virtual void GetFocus() override; virtual void LoseFocus() override; void Init(); -- cgit v1.2.3