1 |
From a0b2c38d4f811a3fc576d710d1a13bd0cdeb8bd5 Mon Sep 17 00:00:00 2001 |
2 |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com> |
3 |
Date: Wed, 12 Apr 2017 10:45:35 +0100 |
4 |
Subject: [PATCH] infinite SetDefaultSize->SetPosSize->SetDefaultSize |
5 |
|
6 |
https://retrace.fedoraproject.org/faf/reports/1278627/ |
7 |
|
8 |
presumably the 'optimal' starting size hits the invalid size path |
9 |
causing another attempt usin the optimal size, so force a valid |
10 |
initial fallback size |
11 |
|
12 |
Change-Id: I6c38ee5e1b90ce41a4550c8a8370e791f5c351b0 |
13 |
(cherry picked from commit 4930acb18bbd145fd995084cd95e3e9d631424ed) |
14 |
--- |
15 |
vcl/source/window/dialog.cxx | 3 ++- |
16 |
1 file changed, 2 insertions(+), 1 deletion(-) |
17 |
|
18 |
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx |
19 |
index eef4c5a..bff1f27 100644 |
20 |
--- a/vcl/source/window/dialog.cxx |
21 |
+++ b/vcl/source/window/dialog.cxx |
22 |
@@ -662,7 +662,8 @@ Size bestmaxFrameSizeForScreenSize(const Size &rScreenSize) |
23 |
else |
24 |
h -= 100; |
25 |
|
26 |
- return Size(w, h); |
27 |
+ return Size(std::max<long>(w, 640 - 15), |
28 |
+ std::max<long>(h, 480 - 50)); |
29 |
} |
30 |
|
31 |
void Dialog::StateChanged( StateChangedType nType ) |
32 |
-- |
33 |
2.9.3 |
34 |
|