summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeandro Pereira <leandro@profusion.mobi>2012-12-21 17:37:58 +0000
committerLeandro Pereira <leandro@profusion.mobi>2012-12-21 17:37:58 +0000
commitd0378828e3b71898a1724d2ad5c07e6afeaf1c9b (patch)
treeb0db203b8775e01a7833d5465a5f75aa7e6b9cf2
parent9b407b34e13becb1251cc93e6db862fa62e14662 (diff)
e/modules/comp: Revert 81509.
The fix pushed to Evas in r81563 should be a proper fix (which should work in other places as well). SVN revision: 81564
-rw-r--r--src/modules/comp/e_mod_comp.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/src/modules/comp/e_mod_comp.c b/src/modules/comp/e_mod_comp.c
index 5b5b18898..48db4b255 100644
--- a/src/modules/comp/e_mod_comp.c
+++ b/src/modules/comp/e_mod_comp.c
@@ -322,7 +322,6 @@ _e_mod_comp_win_shape_rectangles_apply(E_Comp_Win *cw,
322 return; 322 return;
323 } 323 }
324 324
325 evas_sync(evas_object_evas_get(cw->obj));
326 evas_object_image_native_surface_set(cw->obj, NULL); 325 evas_object_image_native_surface_set(cw->obj, NULL);
327 evas_object_image_alpha_set(cw->obj, 1); 326 evas_object_image_alpha_set(cw->obj, 1);
328 EINA_LIST_FOREACH(cw->obj_mirror, l, o) 327 EINA_LIST_FOREACH(cw->obj_mirror, l, o)
@@ -401,7 +400,6 @@ _e_mod_comp_win_shape_rectangles_apply(E_Comp_Win *cw,
401 return; 400 return;
402 } 401 }
403 402
404 evas_sync(evas_object_evas_get(cw->obj));
405 evas_object_image_alpha_set(cw->obj, 0); 403 evas_object_image_alpha_set(cw->obj, 0);
406 EINA_LIST_FOREACH(cw->obj_mirror, l, o) 404 EINA_LIST_FOREACH(cw->obj_mirror, l, o)
407 { 405 {
@@ -614,7 +612,6 @@ _e_mod_comp_win_update(E_Comp_Win *cw)
614 cw->pw = 0; 612 cw->pw = 0;
615 cw->ph = 0; 613 cw->ph = 0;
616 } 614 }
617 evas_sync(evas_object_evas_get(cw->obj));
618 DBG("REND [0x%x] pixmap = [0x%x], %ix%i\n", cw->win, cw->pixmap, cw->pw, cw->ph); 615 DBG("REND [0x%x] pixmap = [0x%x], %ix%i\n", cw->win, cw->pixmap, cw->pw, cw->ph);
619 if ((cw->pw <= 0) || (cw->ph <= 0)) 616 if ((cw->pw <= 0) || (cw->ph <= 0))
620 { 617 {
@@ -683,7 +680,6 @@ _e_mod_comp_win_update(E_Comp_Win *cw)
683/* DBG("DEBUG - pm now %x\n", e_mod_comp_wl_pixmap_get(cw->win)); */ 680/* DBG("DEBUG - pm now %x\n", e_mod_comp_wl_pixmap_get(cw->win)); */
684/* #endif */ 681/* #endif */
685 /* DBG("DEBUG - pm now %x\n", ecore_x_composite_name_window_pixmap_get(cw->win)); */ 682 /* DBG("DEBUG - pm now %x\n", ecore_x_composite_name_window_pixmap_get(cw->win)); */
686 evas_sync(evas_object_evas_get(cw->obj));
687 evas_object_image_size_set(cw->obj, cw->pw, cw->ph); 683 evas_object_image_size_set(cw->obj, cw->pw, cw->ph);
688 EINA_LIST_FOREACH(cw->obj_mirror, l, o) 684 EINA_LIST_FOREACH(cw->obj_mirror, l, o)
689 { 685 {
@@ -732,7 +728,6 @@ _e_mod_comp_win_update(E_Comp_Win *cw)
732 } 728 }
733 else if (cw->pixmap) 729 else if (cw->pixmap)
734 { 730 {
735 evas_sync(evas_object_evas_get(cw->obj));
736 if (cw->native) 731 if (cw->native)
737 { 732 {
738 evas_object_image_native_surface_set(cw->obj, NULL); 733 evas_object_image_native_surface_set(cw->obj, NULL);
@@ -993,7 +988,6 @@ _e_mod_comp_win_release(E_Comp_Win *cw)
993 Eina_List *l; 988 Eina_List *l;
994 Evas_Object *o; 989 Evas_Object *o;
995 990
996 evas_sync(evas_object_evas_get(cw->obj));
997 if (cw->xim) 991 if (cw->xim)
998 { 992 {
999 evas_object_image_size_set(cw->obj, 1, 1); 993 evas_object_image_size_set(cw->obj, 1, 1);
@@ -2145,7 +2139,6 @@ _e_mod_comp_win_del(E_Comp_Win *cw)
2145 { 2139 {
2146 EINA_LIST_FREE(cw->obj_mirror, o) 2140 EINA_LIST_FREE(cw->obj_mirror, o)
2147 { 2141 {
2148 evas_sync(evas_object_evas_get(o));
2149 if (cw->xim) evas_object_image_data_set(o, NULL); 2142 if (cw->xim) evas_object_image_data_set(o, NULL);
2150 evas_object_event_callback_del(o, EVAS_CALLBACK_DEL, 2143 evas_object_event_callback_del(o, EVAS_CALLBACK_DEL,
2151 _e_mod_comp_cb_win_mirror_del); 2144 _e_mod_comp_cb_win_mirror_del);
@@ -2205,7 +2198,6 @@ _e_mod_comp_win_show(E_Comp_Win *cw)
2205 { 2198 {
2206 DBG(" [0x%x] real hid - fix\n", cw->win); 2199 DBG(" [0x%x] real hid - fix\n", cw->win);
2207 cw->real_hid = 0; 2200 cw->real_hid = 0;
2208 evas_sync(evas_object_evas_get(cw->obj));
2209 if (cw->native) 2201 if (cw->native)
2210 { 2202 {
2211 evas_object_image_native_surface_set(cw->obj, NULL); 2203 evas_object_image_native_surface_set(cw->obj, NULL);
@@ -2251,7 +2243,6 @@ _e_mod_comp_win_show(E_Comp_Win *cw)
2251 2243
2252 if ((!cw->redirected) || (!cw->pixmap)) 2244 if ((!cw->redirected) || (!cw->pixmap))
2253 { 2245 {
2254 evas_sync(evas_object_evas_get(cw->obj));
2255 // we redirect all subwindows anyway 2246 // we redirect all subwindows anyway
2256 // ecore_x_composite_redirect_window(cw->win, ECORE_X_COMPOSITE_UPDATE_MANUAL); 2247 // ecore_x_composite_redirect_window(cw->win, ECORE_X_COMPOSITE_UPDATE_MANUAL);
2257/* #ifdef HAVE_WAYLAND_CLIENTS */ 2248/* #ifdef HAVE_WAYLAND_CLIENTS */
@@ -2377,8 +2368,6 @@ _e_mod_comp_win_hide(E_Comp_Win *cw)
2377 ecore_timer_del(cw->ready_timeout); 2368 ecore_timer_del(cw->ready_timeout);
2378 cw->ready_timeout = NULL; 2369 cw->ready_timeout = NULL;
2379 } 2370 }
2380
2381 evas_sync(evas_object_evas_get(cw->obj));
2382 2371
2383 if (cw->native) 2372 if (cw->native)
2384 { 2373 {