From 739322e40a89e032d89f643041b4b2b19734fc29 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 25 Sep 2015 22:21:25 -0400 Subject: [PATCH] ecore_evas-x11: unset withdrawn flag when showing the ecore evas while the window map event seemed like a reasonable place to unset the withdrawn state at the time, studies and further tests have proven that the direct show callback is even more reasonable and effective ref T2745 --- src/modules/ecore_evas/engines/x/ecore_evas_x.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 e4339d20b2..afe0293c80 100644 --- a/src/modules/ecore_evas/engines/x/ecore_evas_x.c +++ b/src/modules/ecore_evas/engines/x/ecore_evas_x.c @@ -1640,12 +1640,6 @@ _ecore_evas_x_event_window_show(void *data EINA_UNUSED, int type EINA_UNUSED, vo } if ((first_map_bug) && (!strcmp(ee->driver, "opengl_x11"))) evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h); - if (ee->prop.withdrawn) - { - ee->prop.withdrawn = EINA_FALSE; - if (ee->func.fn_state_change) ee->func.fn_state_change(ee); - _ecore_evas_x_hints_update(ee); - } if (ee->visible) return ECORE_CALLBACK_PASS_ON; // if (ee->visible) return ECORE_CALLBACK_DONE; // printf("SHOW EVENT %p\n", ee); @@ -2864,6 +2858,12 @@ _ecore_evas_x_show(Ecore_Evas *ee) ecore_x_window_show(ee->prop.window); if (ee->prop.fullscreen) ecore_x_window_focus(ee->prop.window); + if (ee->prop.withdrawn) + { + ee->prop.withdrawn = EINA_FALSE; + if (ee->func.fn_state_change) ee->func.fn_state_change(ee); + _ecore_evas_x_hints_update(ee); + } } static void