summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2015-09-25 22:21:25 -0400
committerMike Blumenkrantz <zmike@osg.samsung.com>2015-09-25 22:21:25 -0400
commitb20910087000e6c6f6ae8056b5cdea26398f133b (patch)
tree693b395667997d4a682b2cb1cb95a0c62e0c42a7 /src
parente31c7036618ba9c4ebda10a2366022f4c4877e77 (diff)
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
Diffstat (limited to 'src')
-rw-r--r--src/modules/ecore_evas/engines/x/ecore_evas_x.c12
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 465d8f5e87..b756461c2e 100644
--- a/src/modules/ecore_evas/engines/x/ecore_evas_x.c
+++ b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
@@ -1706,12 +1706,6 @@ _ecore_evas_x_event_window_show(void *data EINA_UNUSED, int type EINA_UNUSED, vo
1706 } 1706 }
1707 if ((first_map_bug) && (!strcmp(ee->driver, "opengl_x11"))) 1707 if ((first_map_bug) && (!strcmp(ee->driver, "opengl_x11")))
1708 evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h); 1708 evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
1709 if (ee->prop.withdrawn)
1710 {
1711 ee->prop.withdrawn = EINA_FALSE;
1712 if (ee->func.fn_state_change) ee->func.fn_state_change(ee);
1713 _ecore_evas_x_hints_update(ee);
1714 }
1715 if (ee->visible) return ECORE_CALLBACK_PASS_ON; 1709 if (ee->visible) return ECORE_CALLBACK_PASS_ON;
1716// if (ee->visible) return ECORE_CALLBACK_DONE; 1710// if (ee->visible) return ECORE_CALLBACK_DONE;
1717// printf("SHOW EVENT %p\n", ee); 1711// printf("SHOW EVENT %p\n", ee);
@@ -2924,6 +2918,12 @@ _ecore_evas_x_show(Ecore_Evas *ee)
2924 ecore_x_window_show(ee->prop.window); 2918 ecore_x_window_show(ee->prop.window);
2925 if (ee->prop.fullscreen) 2919 if (ee->prop.fullscreen)
2926 ecore_x_window_focus(ee->prop.window); 2920 ecore_x_window_focus(ee->prop.window);
2921 if (ee->prop.withdrawn)
2922 {
2923 ee->prop.withdrawn = EINA_FALSE;
2924 if (ee->func.fn_state_change) ee->func.fn_state_change(ee);
2925 _ecore_evas_x_hints_update(ee);
2926 }
2927} 2927}
2928 2928
2929static void 2929static void