summaryrefslogtreecommitdiff
path: root/vcl/source
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-04-12 10:45:35 +0100
committerCaolán McNamara <caolanm@redhat.com>2017-04-12 10:48:01 +0100
commit4930acb18bbd145fd995084cd95e3e9d631424ed (patch)
treef7247c3e97f3884b625129dbfc0b82f42b8d2aaa /vcl/source
parentbad8bb24142348e7273fedfa5f8f4132a131254e (diff)
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
Diffstat (limited to 'vcl/source')
-rw-r--r--vcl/source/window/dialog.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index e66155d1cc60..95d0e1326b08 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -664,7 +664,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 )