forked from enlightenment/enlightenment
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
This commit is contained in:
parent
9b407b34e1
commit
d0378828e3
|
@ -322,7 +322,6 @@ _e_mod_comp_win_shape_rectangles_apply(E_Comp_Win *cw,
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
evas_sync(evas_object_evas_get(cw->obj));
|
|
||||||
evas_object_image_native_surface_set(cw->obj, NULL);
|
evas_object_image_native_surface_set(cw->obj, NULL);
|
||||||
evas_object_image_alpha_set(cw->obj, 1);
|
evas_object_image_alpha_set(cw->obj, 1);
|
||||||
EINA_LIST_FOREACH(cw->obj_mirror, l, o)
|
EINA_LIST_FOREACH(cw->obj_mirror, l, o)
|
||||||
|
@ -401,7 +400,6 @@ _e_mod_comp_win_shape_rectangles_apply(E_Comp_Win *cw,
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
evas_sync(evas_object_evas_get(cw->obj));
|
|
||||||
evas_object_image_alpha_set(cw->obj, 0);
|
evas_object_image_alpha_set(cw->obj, 0);
|
||||||
EINA_LIST_FOREACH(cw->obj_mirror, l, o)
|
EINA_LIST_FOREACH(cw->obj_mirror, l, o)
|
||||||
{
|
{
|
||||||
|
@ -614,7 +612,6 @@ _e_mod_comp_win_update(E_Comp_Win *cw)
|
||||||
cw->pw = 0;
|
cw->pw = 0;
|
||||||
cw->ph = 0;
|
cw->ph = 0;
|
||||||
}
|
}
|
||||||
evas_sync(evas_object_evas_get(cw->obj));
|
|
||||||
DBG("REND [0x%x] pixmap = [0x%x], %ix%i\n", cw->win, cw->pixmap, cw->pw, cw->ph);
|
DBG("REND [0x%x] pixmap = [0x%x], %ix%i\n", cw->win, cw->pixmap, cw->pw, cw->ph);
|
||||||
if ((cw->pw <= 0) || (cw->ph <= 0))
|
if ((cw->pw <= 0) || (cw->ph <= 0))
|
||||||
{
|
{
|
||||||
|
@ -683,7 +680,6 @@ _e_mod_comp_win_update(E_Comp_Win *cw)
|
||||||
/* DBG("DEBUG - pm now %x\n", e_mod_comp_wl_pixmap_get(cw->win)); */
|
/* DBG("DEBUG - pm now %x\n", e_mod_comp_wl_pixmap_get(cw->win)); */
|
||||||
/* #endif */
|
/* #endif */
|
||||||
/* DBG("DEBUG - pm now %x\n", ecore_x_composite_name_window_pixmap_get(cw->win)); */
|
/* DBG("DEBUG - pm now %x\n", ecore_x_composite_name_window_pixmap_get(cw->win)); */
|
||||||
evas_sync(evas_object_evas_get(cw->obj));
|
|
||||||
evas_object_image_size_set(cw->obj, cw->pw, cw->ph);
|
evas_object_image_size_set(cw->obj, cw->pw, cw->ph);
|
||||||
EINA_LIST_FOREACH(cw->obj_mirror, l, o)
|
EINA_LIST_FOREACH(cw->obj_mirror, l, o)
|
||||||
{
|
{
|
||||||
|
@ -732,7 +728,6 @@ _e_mod_comp_win_update(E_Comp_Win *cw)
|
||||||
}
|
}
|
||||||
else if (cw->pixmap)
|
else if (cw->pixmap)
|
||||||
{
|
{
|
||||||
evas_sync(evas_object_evas_get(cw->obj));
|
|
||||||
if (cw->native)
|
if (cw->native)
|
||||||
{
|
{
|
||||||
evas_object_image_native_surface_set(cw->obj, NULL);
|
evas_object_image_native_surface_set(cw->obj, NULL);
|
||||||
|
@ -993,7 +988,6 @@ _e_mod_comp_win_release(E_Comp_Win *cw)
|
||||||
Eina_List *l;
|
Eina_List *l;
|
||||||
Evas_Object *o;
|
Evas_Object *o;
|
||||||
|
|
||||||
evas_sync(evas_object_evas_get(cw->obj));
|
|
||||||
if (cw->xim)
|
if (cw->xim)
|
||||||
{
|
{
|
||||||
evas_object_image_size_set(cw->obj, 1, 1);
|
evas_object_image_size_set(cw->obj, 1, 1);
|
||||||
|
@ -2145,7 +2139,6 @@ _e_mod_comp_win_del(E_Comp_Win *cw)
|
||||||
{
|
{
|
||||||
EINA_LIST_FREE(cw->obj_mirror, o)
|
EINA_LIST_FREE(cw->obj_mirror, o)
|
||||||
{
|
{
|
||||||
evas_sync(evas_object_evas_get(o));
|
|
||||||
if (cw->xim) evas_object_image_data_set(o, NULL);
|
if (cw->xim) evas_object_image_data_set(o, NULL);
|
||||||
evas_object_event_callback_del(o, EVAS_CALLBACK_DEL,
|
evas_object_event_callback_del(o, EVAS_CALLBACK_DEL,
|
||||||
_e_mod_comp_cb_win_mirror_del);
|
_e_mod_comp_cb_win_mirror_del);
|
||||||
|
@ -2205,7 +2198,6 @@ _e_mod_comp_win_show(E_Comp_Win *cw)
|
||||||
{
|
{
|
||||||
DBG(" [0x%x] real hid - fix\n", cw->win);
|
DBG(" [0x%x] real hid - fix\n", cw->win);
|
||||||
cw->real_hid = 0;
|
cw->real_hid = 0;
|
||||||
evas_sync(evas_object_evas_get(cw->obj));
|
|
||||||
if (cw->native)
|
if (cw->native)
|
||||||
{
|
{
|
||||||
evas_object_image_native_surface_set(cw->obj, NULL);
|
evas_object_image_native_surface_set(cw->obj, NULL);
|
||||||
|
@ -2251,7 +2243,6 @@ _e_mod_comp_win_show(E_Comp_Win *cw)
|
||||||
|
|
||||||
if ((!cw->redirected) || (!cw->pixmap))
|
if ((!cw->redirected) || (!cw->pixmap))
|
||||||
{
|
{
|
||||||
evas_sync(evas_object_evas_get(cw->obj));
|
|
||||||
// we redirect all subwindows anyway
|
// we redirect all subwindows anyway
|
||||||
// ecore_x_composite_redirect_window(cw->win, ECORE_X_COMPOSITE_UPDATE_MANUAL);
|
// ecore_x_composite_redirect_window(cw->win, ECORE_X_COMPOSITE_UPDATE_MANUAL);
|
||||||
/* #ifdef HAVE_WAYLAND_CLIENTS */
|
/* #ifdef HAVE_WAYLAND_CLIENTS */
|
||||||
|
@ -2378,8 +2369,6 @@ _e_mod_comp_win_hide(E_Comp_Win *cw)
|
||||||
cw->ready_timeout = NULL;
|
cw->ready_timeout = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
evas_sync(evas_object_evas_get(cw->obj));
|
|
||||||
|
|
||||||
if (cw->native)
|
if (cw->native)
|
||||||
{
|
{
|
||||||
evas_object_image_native_surface_set(cw->obj, NULL);
|
evas_object_image_native_surface_set(cw->obj, NULL);
|
||||||
|
|
Loading…
Reference in New Issue