summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-11-21 11:04:41 +0000
committerAdolfo Jayme Barrientos <fitojb@ubuntu.com>2018-11-21 20:33:43 +0100
commitbcacc66e2d1331767da77b24b3d933d4e46533a6 (patch)
treed31351083e51efd392b0134d7b1eb0ba403de043
parent031e1528a0e8e90a534b4b377eddac46b5d15937 (diff)
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@ubuntu.com>
-rw-r--r--vcl/source/window/layout.cxx5
1 files changed, 4 insertions, 1 deletions
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)