summaryrefslogtreecommitdiff
path: root/vcl/source/window
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-11-21 11:04:41 +0000
committerCaolán McNamara <caolanm@redhat.com>2018-11-21 15:35:58 +0100
commit02b905c8569e2d7631efd61008b4ab0e9353d994 (patch)
tree164babaf7b893cbe29cef668124c1f0414070d9e /vcl/source/window
parent7fb708ed9fa4f1586887f9b3b541330aa17bbeae (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/63706 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/source/window')
-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 837d429c82b5..b68fd2dbcba1 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -2481,6 +2481,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
@@ -2488,9 +2489,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)