summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2018-06-23 23:57:00 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2018-06-23 23:57:00 +0900
commit7bf845b24ca7bd12273f5207022e1e5db4ad2e78 (patch)
treec361e9f18c1d3a09f155cc6ffce11cd541d9380b
parent65da58726f753c1a12aaf525d7f0f646188a75a7 (diff)
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.
-rw-r--r--src/lib/elementary/efl_ui_win.c11
1 files 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)
977 } 977 }
978 978
979 sd->response++; 979 sd->response++;
980 sd->req_wh = EINA_FALSE; 980// set to false in _elm_win_pre_render()
981// sd->req_wh = EINA_FALSE;
981 evas_object_resize(sd->obj, w, h); 982 evas_object_resize(sd->obj, w, h);
982 evas_object_resize(sd->legacy.edje, w, h); 983 evas_object_resize(sd->legacy.edje, w, h);
983 sd->response--; 984 sd->response--;
@@ -1031,6 +1032,7 @@ _elm_win_pre_render(Ecore_Evas *ee)
1031 _elm_win_resize_job(sd->obj); 1032 _elm_win_resize_job(sd->obj);
1032 _elm_win_frame_obj_update(sd, 1); 1033 _elm_win_frame_obj_update(sd, 1);
1033 } 1034 }
1035 sd->req_wh = EINA_FALSE;
1034} 1036}
1035 1037
1036static void 1038static void
@@ -1549,8 +1551,11 @@ _elm_win_frame_obj_update(Efl_Ui_Win_Data *sd, Eina_Bool force)
1549 evas_object_geometry_get(sd->obj, NULL, NULL, &w, &h); 1551 evas_object_geometry_get(sd->obj, NULL, NULL, &w, &h);
1550 else 1552 else
1551 w = ow, h = oh; 1553 w = ow, h = oh;
1552 if (w && h) 1554 if (!sd->req_wh)
1553 TRAP(sd, resize, w, h); 1555 {
1556 if (w && h)
1557 TRAP(sd, resize, w, h);
1558 }
1554} 1559}
1555 1560
1556static void 1561static void