summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2017-08-07 13:26:41 -0400
committerMike Blumenkrantz <zmike@osg.samsung.com>2017-08-07 13:27:18 -0400
commitae013cf33abefccc639f3397ebef7bb0f4b80cbb (patch)
treed419b5e53f8a70b31617166393a21099765ff26e
parent886ff17d433056a965f44abae9655e0956c0748c (diff)
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
-rw-r--r--src/lib/elementary/efl_ui_win.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 63f3957dd5..12b44306ac 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)
1460{ 1460{
1461 int ox, oy, ow, oh; 1461 int ox, oy, ow, oh;
1462 int cx, cy, cw, ch; 1462 int cx, cy, cw, ch;
1463 int w, h;
1463 1464
1464 if (!sd->frame_obj) return; 1465 if (!sd->frame_obj) return;
1465 _elm_win_opaque_dirty(sd); 1466 _elm_win_opaque_dirty(sd);
1466 _elm_win_frame_geometry_adjust(sd); 1467 _elm_win_frame_geometry_adjust(sd);
1467 evas_object_geometry_get(sd->frame_obj, &ox, &oy, &ow, &oh); 1468 evas_object_geometry_get(sd->frame_obj, &ox, &oy, &ow, &oh);
1468 edje_object_part_geometry_get(sd->frame_obj, "elm.spacer.content", &cx, &cy, &cw, &ch); 1469 edje_object_part_geometry_get(sd->frame_obj, "elm.spacer.content", &cx, &cy, &cw, &ch);
1469 if (_elm_win_framespace_set(sd, cx, cy, ow - cw, oh - ch)) 1470 if (!_elm_win_framespace_set(sd, cx, cy, ow - cw, oh - ch)) return;
1470 _elm_win_resize_objects_eval(sd->obj, EINA_TRUE); 1471 _elm_win_frame_geometry_adjust(sd);
1472 evas_object_geometry_get(sd->obj, NULL, NULL, &w, &h);
1473 TRAP(sd, resize, w, h);
1471} 1474}
1472 1475
1473static void 1476static void