aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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
int max_w, max_h;
int norender;
int modal_count;
- int response;
Eina_Bool req_wh : 1;
Eina_Bool req_xy : 1;
@@ -934,11 +933,9 @@ _elm_win_move(Ecore_Evas *ee)
efl_event_callback_legacy_call(sd->obj, EFL_GFX_ENTITY_EVENT_MOVE, NULL);
ELM_WIN_DATA_ALIVE_CHECK(obj, sd);
evas_nochange_push(evas_object_evas_get(sd->obj));
- sd->response++;
sd->req_xy = EINA_FALSE;
evas_object_move(sd->obj, x, y);
ELM_WIN_DATA_ALIVE_CHECK(obj, sd);
- sd->response--;
evas_nochange_pop(evas_object_evas_get(sd->obj));
}
@@ -975,11 +972,9 @@ _elm_win_resize_job(void *data)
elm_menu_move(sd->main_menu, pos.x, pos.y);
}
- sd->response++;
sd->req_wh = EINA_FALSE;
evas_object_resize(sd->obj, w, h);
evas_object_resize(sd->legacy.edje, w, h);
- sd->response--;
}
static void
@@ -3005,7 +3000,6 @@ _efl_ui_win_efl_gfx_entity_position_set(Eo *obj, Efl_Ui_Win_Data *sd, Eina_Posit
}
else
{
- if (!sd->response)
{
sd->req_xy = EINA_TRUE;
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
}
_elm_win_frame_geometry_adjust(sd);
- if (!sd->response)
{
sd->req_wh = EINA_TRUE;
sd->req_w = sz.w;
@@ -3621,7 +3614,6 @@ _elm_win_resize_objects_eval(Evas_Object *obj, Eina_Bool force_resize)
else
{
_elm_win_frame_geometry_adjust(sd);
- if (!sd->response)
{
sd->req_wh = EINA_TRUE;
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
framespace_resized = EINA_TRUE;
}
+ if ((!e->from_wm) && (!ee->prop.override)) return ECORE_CALLBACK_RENEW;
if (((ee->w + fw) != e->w) || ((ee->h + fh) != e->h) ||
- ((ee->req.w + fw) != e->w) || ((ee->req.h + fh) != e->h) ||
framespace_resized)
{
w = e->w;
h = e->h;
ee->w = w - fw;
ee->h = h - fh;
- ee->req.w = ee->w;
- ee->req.h = ee->h;
if (ECORE_EVAS_PORTRAIT(ee))
{
evas_output_size_set(ee->evas, w, h);