diff options
author | Caolán McNamara <caolanm@redhat.com> | 2018-04-13 10:10:29 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-04-16 14:00:06 +0200 |
commit | 32a38bae39661a4c0f08e5e2a9db8c4f1fda462a (patch) | |
tree | 68c0dd45c20d4f62e81a5c6767bfc68c54dae780 /sfx2/source/inc/workwin.hxx | |
parent | 158f6e5489d8167299deb53fde433e835019d10a (diff) |
Resolves: tdf#116865 trigger pending sizing timers before arranging
trigger pending sizing timers now so we arrange with the final size of the
client area
Otherwise calling GetSizePixel in the Arranging loop will trigger the timers
anyway, causing reentry into Arrange_Impl again where the inner Arrange_Impl
arranges with the final size, and then returns to this outer Arrange_Impl which
would rearrange with the old client area size.
Change-Id: Ibc2b97f679ceaa0a825cee015576f403703a5f9e
Reviewed-on: https://gerrit.libreoffice.org/52816
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'sfx2/source/inc/workwin.hxx')
-rw-r--r-- | sfx2/source/inc/workwin.hxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx index 6a80892900eb..0c714c479446 100644 --- a/sfx2/source/inc/workwin.hxx +++ b/sfx2/source/inc/workwin.hxx @@ -226,6 +226,8 @@ class SfxWorkWindow final void SaveStatus_Impl(SfxChildWindow*, const SfxChildWinInfo&); static bool IsPluginMode( SfxObjectShell const * pObjShell ); + void FlushPendingChildSizes(); + public: SfxWorkWindow( vcl::Window* pWin, SfxFrame* pFrm, SfxFrame* pMaster ); ~SfxWorkWindow(); |