summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Michael <cp.michael@samsung.com>2016-07-27 11:12:23 -0400
committerChris Michael <cp.michael@samsung.com>2016-07-27 11:12:23 -0400
commit3b82375835b7fc5d768d1c32ae6c4db85ee8780d (patch)
treee5ec6ec20d0d735d92dcd615fac1c4028f78d4ac
parentb07a0c523ca83acf7d3ba059be33aa7d7de3ad5a (diff)
elementary: Fix issue of wrong minimum size for some E dialogs
When we are calculating minimum size hints for the window object, we should be adding framespace to maximum size, not subtracting it... Honestly this just looks like a brain-dead typo. Fixes T44225 Signed-off-by: Chris Michael <cp.michael@samsung.com>
-rw-r--r--src/lib/elementary/efl_ui_win.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 3021c97..e35589e 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -2984,12 +2984,13 @@ _elm_win_resize_objects_eval(Evas_Object *obj)
2984 evas_output_framespace_get(sd->evas, &fx, &fy, &fw, &fh); 2984 evas_output_framespace_get(sd->evas, &fx, &fy, &fw, &fh);
2985 minw += fw; 2985 minw += fw;
2986 minh += fh; 2986 minh += fh;
2987 maxw -= fw; 2987 maxw += fw;
2988 maxh -= fh; 2988 maxh += fh;
2989 } 2989 }
2990 2990
2991 evas_object_size_hint_min_set(obj, minw, minh); 2991 evas_object_size_hint_min_set(obj, minw, minh);
2992 evas_object_size_hint_max_set(obj, maxw, maxh); 2992 evas_object_size_hint_max_set(obj, maxw, maxh);
2993
2993 evas_object_geometry_get(obj, NULL, NULL, &w, &h); 2994 evas_object_geometry_get(obj, NULL, NULL, &w, &h);
2994 if (w < minw) w = minw; 2995 if (w < minw) w = minw;
2995 if (h < minh) h = minh; 2996 if (h < minh) h = minh;