diff options
| author | Mike Blumenkrantz <zmike@osg.samsung.com> | 2015-09-25 22:21:25 -0400 |
|---|---|---|
| committer | Cedric BAIL <cedric@osg.samsung.com> | 2015-10-01 11:22:06 -0700 |
| commit | 4ea10a788545de30c379945a262f4cbc2bc3f55c (patch) | |
| tree | 2a07c495dc039ad2b2faf359ee4f2e8c13ad6193 | |
| parent | 9b15832d28dcd05aa0c1d2f92f0e94ac3e3295ed (diff) | |
| download | efl-4ea10a788545de30c379945a262f4cbc2bc3f55c.tar.gz | |
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
| -rw-r--r-- | src/modules/ecore_evas/engines/x/ecore_evas_x.c | 12 |
1 files 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 8d8e46b9bb..6599057a77 100644 --- a/src/modules/ecore_evas/engines/x/ecore_evas_x.c +++ b/src/modules/ecore_evas/engines/x/ecore_evas_x.c @@ -1642,12 +1642,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 |