summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDerek Foreman <derek.foreman.samsung@gmail.com>2018-12-07 10:46:11 -0600
committerDerek Foreman <derek.foreman.samsung@gmail.com>2018-12-14 13:42:14 -0600
commit0611dbc1e9bbf81026e7630a65766c325495bf47 (patch)
tree58eb96e45028c09bdfe150103212e57b198fc9b3 /src
parentaab08fb6a8830433b876c3ee87623231dbfb02c6 (diff)
efl_ui_win: Don't allow the frame object to change size before first draw
This fixes a bug where calling: evas_object_show(win); evas_object_resize(win, 400, 400); elm_run(); Would show a much smaller than 400,400 window on wayland, as the CSD calcs would set the size smaller. It also fixes some differences in startup size between X and wayland for some trivial test clients. Signed-off-by: Derek Foreman <derek.foreman.samsung@gmail.com> Reviewed-by: Chris Michael <cp.michael@samsung.com> Differential Revision: https://phab.enlightenment.org/D7438
Diffstat (limited to 'src')
-rw-r--r--src/lib/elementary/efl_ui_win.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 0d33fe31f0..0eca88120a 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -1551,10 +1551,10 @@ _elm_win_frame_obj_update(Efl_Ui_Win_Data *sd, Eina_Bool force)
1551 1551
1552 if (!_elm_win_framespace_set(sd, cx, cy, ow - cw, oh - ch) && (!force)) return; 1552 if (!_elm_win_framespace_set(sd, cx, cy, ow - cw, oh - ch) && (!force)) return;
1553 _elm_win_frame_geometry_adjust(sd); 1553 _elm_win_frame_geometry_adjust(sd);
1554 if (sd->first_draw) 1554
1555 evas_object_geometry_get(sd->obj, NULL, NULL, &w, &h); 1555 if (!sd->first_draw) return;
1556 else 1556
1557 w = ow, h = oh; 1557 evas_object_geometry_get(sd->obj, NULL, NULL, &w, &h);
1558 if (w && h) 1558 if (w && h)
1559 TRAP(sd, resize, w, h); 1559 TRAP(sd, resize, w, h);
1560} 1560}