diff options
author | Caolán McNamara <caolanm@redhat.com> | 2016-08-15 16:16:40 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2016-08-15 17:18:35 +0100 |
commit | fd0f33b7766f09f64b62e150633601f607ee6897 (patch) | |
tree | e994a313e11dde29614fd333d70c1b9e5e40aea9 /vcl | |
parent | d179edbf4000a75f325238f1ba49b94e49af4b79 (diff) |
Resolves: tdf#92906 badly rendered elements dock after hide+show
The show after hide is seen as "InitShow" which find the optimal size for its
contents. That's ok if it was a toplevel dialog, but its not in this
circumstance of a docked docking window and has to live with the given size.
This seems to have basically come unstuck with
commit 05d4077b724f91fca736d3c3fd64f28e304d7172
Author: Caolán McNamara <caolanm@redhat.com>
Date: Mon Sep 1 07:17:09 2014 +0100
rearrange matters to get FloatingWindows working loaded from .ui
Change-Id: If47bb392c8235d946bb2fd07448c6f48479a5163
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/source/window/dockwin.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index 56c968c733c7..6c927b80e38b 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -704,7 +704,8 @@ void DockingWindow::DoInitialLayout() { mbIsCalculatingInitialLayoutSize = true; setDeferredProperties(); - setOptimalLayoutSize(); + if (IsFloatingMode()) + setOptimalLayoutSize(); mbIsCalculatingInitialLayoutSize = false; mbInitialLayoutDone = true; } |