diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-04-12 10:45:35 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-04-12 15:36:43 +0200 |
| commit | 3e4e13300db6a0c2c60dbe733d96ff5a7b0d32e5 (patch) | |
| tree | 5484f360e7977d744621ce0ca9ce5951c7638b45 /vcl | |
| parent | 776839b8bfc6eed905ce97c6fe32af8deb8d1451 (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
(cherry picked from commit 4930acb18bbd145fd995084cd95e3e9d631424ed)
Reviewed-on: https://gerrit.libreoffice.org/36453
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/dialog.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
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 ) |