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

[Caolán McNamara]

 vcl/source/window/dialog.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 3e4e13300db6a0c2c60dbe733d96ff5a7b0d32e5
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Apr 12 10:45:35 2017 +0100

    infinite SetDefaultSize->SetPosSize->SetDefaultSize
    
    https://retrace.fedoraproject.org/faf/reports/1278627/
    
    presumably the 'optimal' starting size hits the invalid size path
    causing another attempt usin the optimal size, so force a valid
    initial fallback size
    
    Change-Id: I6c38ee5e1b90ce41a4550c8a8370e791f5c351b0
    (cherry picked from commit 4930acb18bbd145fd995084cd95e3e9d631424ed)
    Reviewed-on: https://gerrit.libreoffice.org/36453
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index eef4c5ab5018..bff1f27a9613 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -662,7 +662,8 @@ Size bestmaxFrameSizeForScreenSize(const Size &rScreenSize)
     else
         h -= 100;
 
-    return Size(w, h);
+    return Size(std::max<long>(w, 640 - 15),
+                std::max<long>(h, 480 - 50));
 }
 
 void Dialog::StateChanged( StateChangedType nType )