diff options
author | Caolán McNamara <caolanm@redhat.com> | 2020-02-12 20:18:00 +0000 |
---|---|---|
committer | Michael Stahl <michael.stahl@cib.de> | 2020-02-17 14:14:50 +0100 |
commit | 4d59f79bd3993c59cd04707db8f95787554b3a63 (patch) | |
tree | 6a7f5320ffc1c1f6ae3504889ad1fda9e1c769e2 /dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx | |
parent | 6d1efc2b5dac95647b6e2c1ed7059e1964acf4fa (diff) |
tdf#130623 owner of FieldControl needs to set its allocation
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 <michael.stahl@cib.de>
(cherry picked from commit 96018929add55cff71a036be3a67df385b023471)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88694
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Michael Stahl <michael.stahl@cib.de>
Diffstat (limited to 'dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx')
-rw-r--r-- | dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx | 7 |
1 files changed, 7 insertions, 0 deletions
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 <vcl/idle.hxx> #include <vcl/tabpage.hxx> #include <IClipBoardTest.hxx> @@ -33,6 +34,10 @@ namespace dbaui { VclPtr<OTableFieldControl> 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(); |