raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=7bf845b24ca7bd12273f5207022e1e5db4ad2e78
commit 7bf845b24ca7bd12273f5207022e1e5db4ad2e78
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date: Sat Jun 23 23:57:00 2018 +0900
elm win - fix resizing on show. rage was broken last week. this fixes it
rage window with no file passed ended up like 10x40 ... which is
wrong. it wasn't. rage code explicitly resizes the window before show
and this wsas being overriden. tested rage, terminology, em test in
both x and wl. all still work (for me) post commit.
---
src/lib/elementary/efl_ui_win.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 9a662c43b7..6bd5b4da06 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -977,7 +977,8 @@ _elm_win_resize_job(void *data)
}
sd->response++;
- sd->req_wh = EINA_FALSE;
+// set to false in _elm_win_pre_render()
+// sd->req_wh = EINA_FALSE;
evas_object_resize(sd->obj, w, h);
evas_object_resize(sd->legacy.edje, w, h);
sd->response--;
@@ -1031,6 +1032,7 @@ _elm_win_pre_render(Ecore_Evas *ee)
_elm_win_resize_job(sd->obj);
_elm_win_frame_obj_update(sd, 1);
}
+ sd->req_wh = EINA_FALSE;
}
static void
@@ -1549,8 +1551,11 @@ _elm_win_frame_obj_update(Efl_Ui_Win_Data *sd, Eina_Bool
force)
evas_object_geometry_get(sd->obj, NULL, NULL, &w, &h);
else
w = ow, h = oh;
- if (w && h)
- TRAP(sd, resize, w, h);
+ if (!sd->req_wh)
+ {
+ if (w && h)
+ TRAP(sd, resize, w, h);
+ }
}
static void
--
