From 56936c91c09a3ad4e044b46a164edc0e16e359c5 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Mon, 7 Aug 2017 13:26:41 -0400 Subject: [PATCH] elm_win: simplify/fix recalc logic when changing csd forcing a full eval here is unnecessary and broken since such an eval could either change geometry in unexpected ways or fail to accurately change the underlying canvas geometry @fix --- src/lib/elementary/efl_ui_win.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index ab947cdfe5..1caa4e125c 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c @@ -1460,14 +1460,17 @@ _elm_win_frame_obj_update(Efl_Ui_Win_Data *sd) { int ox, oy, ow, oh; int cx, cy, cw, ch; + int w, h; if (!sd->frame_obj) return; _elm_win_opaque_dirty(sd); _elm_win_frame_geometry_adjust(sd); evas_object_geometry_get(sd->frame_obj, &ox, &oy, &ow, &oh); edje_object_part_geometry_get(sd->frame_obj, "elm.spacer.content", &cx, &cy, &cw, &ch); - if (_elm_win_framespace_set(sd, cx, cy, ow - cw, oh - ch)) - _elm_win_resize_objects_eval(sd->obj, EINA_TRUE); + if (!_elm_win_framespace_set(sd, cx, cy, ow - cw, oh - ch)) return; + _elm_win_frame_geometry_adjust(sd); + evas_object_geometry_get(sd->obj, NULL, NULL, &w, &h); + TRAP(sd, resize, w, h); } static void