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

[Libreoffice Gerrit user]

 vcl/source/window/layout.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit bcacc66e2d1331767da77b24b3d933d4e46533a6
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Nov 21 11:04:41 2018 +0000
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Wed Nov 21 20:33:43 2018 +0100

    Resolves: tdf#121547 do normal dialog layout first
    
    then, if still too small, re-layout with the bigger size
    
    Change-Id: I1425e7a55dced4bd93e365a38383eda07fb16d16
    Reviewed-on: https://gerrit.libreoffice.org/63708
    Tested-by: Jenkins
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 5b29ff125307..7ee56d5158ab 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -2494,6 +2494,7 @@ void MessageDialog::set_secondary_text(const OUString &rSecondaryString)
 
 void MessageDialog::StateChanged(StateChangedType nType)
 {
+    Dialog::StateChanged(nType);
     if (nType == StateChangedType::InitShow)
     {
         // MessageBox should be at least as wide as to see the title
@@ -2501,9 +2502,11 @@ void MessageDialog::StateChanged(StateChangedType nType)
         // Extra-Width for Close button
         nTitleWidth += mpWindowImpl->mnTopBorder;
         if (get_preferred_size().Width() < nTitleWidth)
+        {
             set_width_request(nTitleWidth);
+            DoInitialLayout();
+        }
     }
-    Dialog::StateChanged(nType);
 }
 
 VclVPaned::VclVPaned(vcl::Window *pParent)