summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2018-08-08 17:14:20 -0400
committerMike Blumenkrantz <zmike@samsung.com>2018-08-08 17:34:58 -0400
commitd1d724aa8e8385ed7517b5adbcaaff2d0a4d318c (patch)
tree1222a9d3bd318065e89fd2d898bdf7c3d7c0bd74
parentea5d2dc64089f6bd85ac92f292cc3304b08f74df (diff)
-rw-r--r--src/lib/elementary/efl_ui_win.c8
-rw-r--r--src/modules/ecore_evas/engines/x/ecore_evas_x.c4
2 files changed, 1 insertions, 11 deletions
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 9a2a9ab1ba..b29da6de4d 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -211,7 +211,6 @@ struct _Efl_Ui_Win_Data
211 int max_w, max_h; 211 int max_w, max_h;
212 int norender; 212 int norender;
213 int modal_count; 213 int modal_count;
214 int response;
215 Eina_Bool req_wh : 1; 214 Eina_Bool req_wh : 1;
216 Eina_Bool req_xy : 1; 215 Eina_Bool req_xy : 1;
217 216
@@ -934,11 +933,9 @@ _elm_win_move(Ecore_Evas *ee)
934 efl_event_callback_legacy_call(sd->obj, EFL_GFX_ENTITY_EVENT_MOVE, NULL); 933 efl_event_callback_legacy_call(sd->obj, EFL_GFX_ENTITY_EVENT_MOVE, NULL);
935 ELM_WIN_DATA_ALIVE_CHECK(obj, sd); 934 ELM_WIN_DATA_ALIVE_CHECK(obj, sd);
936 evas_nochange_push(evas_object_evas_get(sd->obj)); 935 evas_nochange_push(evas_object_evas_get(sd->obj));
937 sd->response++;
938 sd->req_xy = EINA_FALSE; 936 sd->req_xy = EINA_FALSE;
939 evas_object_move(sd->obj, x, y); 937 evas_object_move(sd->obj, x, y);
940 ELM_WIN_DATA_ALIVE_CHECK(obj, sd); 938 ELM_WIN_DATA_ALIVE_CHECK(obj, sd);
941 sd->response--;
942 evas_nochange_pop(evas_object_evas_get(sd->obj)); 939 evas_nochange_pop(evas_object_evas_get(sd->obj));
943} 940}
944 941
@@ -975,11 +972,9 @@ _elm_win_resize_job(void *data)
975 elm_menu_move(sd->main_menu, pos.x, pos.y); 972 elm_menu_move(sd->main_menu, pos.x, pos.y);
976 } 973 }
977 974
978 sd->response++;
979 sd->req_wh = EINA_FALSE; 975 sd->req_wh = EINA_FALSE;
980 evas_object_resize(sd->obj, w, h); 976 evas_object_resize(sd->obj, w, h);
981 evas_object_resize(sd->legacy.edje, w, h); 977 evas_object_resize(sd->legacy.edje, w, h);
982 sd->response--;
983} 978}
984 979
985static void 980static void
@@ -3005,7 +3000,6 @@ _efl_ui_win_efl_gfx_entity_position_set(Eo *obj, Efl_Ui_Win_Data *sd, Eina_Posit
3005 } 3000 }
3006 else 3001 else
3007 { 3002 {
3008 if (!sd->response)
3009 { 3003 {
3010 sd->req_xy = EINA_TRUE; 3004 sd->req_xy = EINA_TRUE;
3011 sd->req_x = pos.x; 3005 sd->req_x = pos.x;
@@ -3071,7 +3065,6 @@ _efl_ui_win_efl_gfx_entity_size_set(Eo *obj, Efl_Ui_Win_Data *sd, Eina_Size2D sz
3071 } 3065 }
3072 3066
3073 _elm_win_frame_geometry_adjust(sd); 3067 _elm_win_frame_geometry_adjust(sd);
3074 if (!sd->response)
3075 { 3068 {
3076 sd->req_wh = EINA_TRUE; 3069 sd->req_wh = EINA_TRUE;
3077 sd->req_w = sz.w; 3070 sd->req_w = sz.w;
@@ -3621,7 +3614,6 @@ _elm_win_resize_objects_eval(Evas_Object *obj, Eina_Bool force_resize)
3621 else 3614 else
3622 { 3615 {
3623 _elm_win_frame_geometry_adjust(sd); 3616 _elm_win_frame_geometry_adjust(sd);
3624 if (!sd->response)
3625 { 3617 {
3626 sd->req_wh = EINA_TRUE; 3618 sd->req_wh = EINA_TRUE;
3627 sd->req_w = w; 3619 sd->req_w = w;
diff --git a/src/modules/ecore_evas/engines/x/ecore_evas_x.c b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
index f1646cbe40..0f1390ac67 100644
--- a/src/modules/ecore_evas/engines/x/ecore_evas_x.c
+++ b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
@@ -1693,16 +1693,14 @@ _ecore_evas_x_event_window_configure(void *data EINA_UNUSED, int type EINA_UNUSE
1693 framespace_resized = EINA_TRUE; 1693 framespace_resized = EINA_TRUE;
1694 } 1694 }
1695 1695
1696 if ((!e->from_wm) && (!ee->prop.override)) return ECORE_CALLBACK_RENEW;
1696 if (((ee->w + fw) != e->w) || ((ee->h + fh) != e->h) || 1697 if (((ee->w + fw) != e->w) || ((ee->h + fh) != e->h) ||
1697 ((ee->req.w + fw) != e->w) || ((ee->req.h + fh) != e->h) ||
1698 framespace_resized) 1698 framespace_resized)
1699 { 1699 {
1700 w = e->w; 1700 w = e->w;
1701 h = e->h; 1701 h = e->h;
1702 ee->w = w - fw; 1702 ee->w = w - fw;
1703 ee->h = h - fh; 1703 ee->h = h - fh;
1704 ee->req.w = ee->w;
1705 ee->req.h = ee->h;
1706 if (ECORE_EVAS_PORTRAIT(ee)) 1704 if (ECORE_EVAS_PORTRAIT(ee))
1707 { 1705 {
1708 evas_output_size_set(ee->evas, w, h); 1706 evas_output_size_set(ee->evas, w, h);