[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - vcl/source

[Caolán McNamara]

 vcl/source/window/syswin.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 1f061d64989f74ea517f9e4951fc856211e7d9f0
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Dec 16 10:46:10 2015 +0000

    Related: tdf#98419 set a min size on un-resizeable non-layout dialogs
    
    (see also rhbz#1281906)
    
    a min size equates to a size-request which is reliable under gtk3+wayland
    as the dialog contents size.
    
    a default size equates to the size of the dialog, which includes decorations
    under wayland
    
    (cherry picked from commit afeddaf7e0d11ad9b1df0c80bcc3f50caa87e21a)
    
    Change-Id: I20baf00fb5952ab93628f4dd6891779ce682783c
    Reviewed-on: https://gerrit.libreoffice.org/23121
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Eike Rathke <erack at redhat.com>

diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index a167c69..3a0c285 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -1128,6 +1128,10 @@ void SystemWindow::DoInitialLayout()
         mbIsCalculatingInitialLayoutSize = false;
         mbInitialLayoutDone = true;
     }
+    else if (!(GetStyle() & WB_SIZEABLE))
+    {
+        SetMinOutputSizePixel(GetSizePixel());
+    }
 }
 
 void SystemWindow::doDeferredInit(WinBits /*nBits*/)