[Libreoffice-commits] core.git: 2 commits - include/vcl vcl/source

[Caolán McNamara]

 include/vcl/dockwin.hxx       |    3 +--
 include/vcl/syswin.hxx        |    1 -
 vcl/source/window/dockwin.cxx |    5 ++---
 vcl/source/window/syswin.cxx  |    2 --
 4 files changed, 3 insertions(+), 8 deletions(-)

New commits:
commit bf882eb5719ed1d1119a1ec8f2f7cad32af39322
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Aug 15 16:23:29 2016 +0100

    mbInitialLayoutDone is unused
    
    Change-Id: Ic660ba53b450071ad222a3c1adb13e908dbf0023

diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx
index b6a0d28..c5e9d32 100644
--- a/include/vcl/dockwin.hxx
+++ b/include/vcl/dockwin.hxx
@@ -236,8 +236,7 @@ private:
                     mbRollUp:1,
                     mbDockBtn:1,
                     mbHideBtn:1,
-                    mbIsCalculatingInitialLayoutSize:1,
-                    mbInitialLayoutDone:1;
+                    mbIsCalculatingInitialLayoutSize:1;
 
 protected:
     bool mbIsDefferedInit;
diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx
index eb2e82a..837a079 100644
--- a/include/vcl/syswin.hxx
+++ b/include/vcl/syswin.hxx
@@ -162,7 +162,6 @@ private:
     bool            mbHideBtn;
     bool            mbSysChild;
     bool            mbIsCalculatingInitialLayoutSize;
-    bool            mbInitialLayoutDone;
     MenuBarMode     mnMenuBarMode;
     sal_uInt16      mnIcon;
     ImplData*       mpImplData;
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index 6c927b8..1a61dd5 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -323,7 +323,6 @@ void DockingWindow::ImplInitDockingWindowData()
     mbHideBtn      = false;
     mbIsDefferedInit = false;
     mbIsCalculatingInitialLayoutSize = false;
-    mbInitialLayoutDone = false;
     mpDialogParent = nullptr;
 
     //To-Do, reuse maResizeTimer
@@ -707,7 +706,6 @@ void DockingWindow::DoInitialLayout()
         if (IsFloatingMode())
             setOptimalLayoutSize();
         mbIsCalculatingInitialLayoutSize = false;
-        mbInitialLayoutDone = true;
     }
 }
 
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index 0bc7a0a..c4d5017 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -77,7 +77,6 @@ SystemWindow::SystemWindow(WindowType nType)
     , mbHideBtn(false)
     , mbSysChild(false)
     , mbIsCalculatingInitialLayoutSize(false)
-    , mbInitialLayoutDone(false)
     , mnMenuBarMode(MenuBarMode::Normal)
     , mnIcon(0)
     , mpImplData(new ImplData)
@@ -1171,7 +1170,6 @@ void SystemWindow::DoInitialLayout()
         setDeferredProperties();
         setOptimalLayoutSize();
         mbIsCalculatingInitialLayoutSize = false;
-        mbInitialLayoutDone = true;
     }
     else if (IsDialog() && !(GetStyle() & WB_SIZEABLE))
     {
commit fd0f33b7766f09f64b62e150633601f607ee6897
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Aug 15 16:16:40 2016 +0100

    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 at redhat.com>
    Date:   Mon Sep 1 07:17:09 2014 +0100
    
        rearrange matters to get FloatingWindows working loaded from .ui
    
    Change-Id: If47bb392c8235d946bb2fd07448c6f48479a5163

diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index 56c968c..6c927b8 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;
     }