summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/modules/ecore_evas/engines/x/ecore_evas_x.c19
1 files changed, 11 insertions, 8 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 4cfafcd..01fd64c 100644
--- a/src/modules/ecore_evas/engines/x/ecore_evas_x.c
+++ b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
@@ -1650,18 +1650,22 @@ _ecore_evas_x_event_window_configure(void *data EINA_UNUSED, int type EINA_UNUSE
1650 if (!ee) return ECORE_CALLBACK_PASS_ON; /* pass on event */ 1650 if (!ee) return ECORE_CALLBACK_PASS_ON; /* pass on event */
1651 edata = ee->engine.data; 1651 edata = ee->engine.data;
1652 if (e->win != ee->prop.window) return ECORE_CALLBACK_PASS_ON; 1652 if (e->win != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
1653 if (!edata->configured) 1653 if ((e->from_wm) || (ee->prop.override))
1654 { 1654 {
1655 if (edata->fully_obscured) 1655 if (!edata->configured)
1656 { 1656 {
1657 /* FIXME: round trip */ 1657 if (edata->fully_obscured)
1658 if (!ecore_x_screen_is_composited(edata->screen_num)) 1658 {
1659 /* FIXME: round trip */
1660 if (!ecore_x_screen_is_composited(edata->screen_num))
1661 ee->draw_block = EINA_FALSE;
1662 }
1663 else
1659 ee->draw_block = EINA_FALSE; 1664 ee->draw_block = EINA_FALSE;
1660 } 1665 }
1661 else 1666 edata->configure_coming = 0;
1662 ee->draw_block = EINA_FALSE; 1667 edata->configured = 1;
1663 } 1668 }
1664 edata->configured = 1;
1665 if (edata->direct_resize) return ECORE_CALLBACK_PASS_ON; 1669 if (edata->direct_resize) return ECORE_CALLBACK_PASS_ON;
1666 1670
1667 pointer = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_TYPE_MOUSE); 1671 pointer = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_TYPE_MOUSE);
@@ -1671,7 +1675,6 @@ _ecore_evas_x_event_window_configure(void *data EINA_UNUSED, int type EINA_UNUSE
1671 1675
1672 if (edata->configure_reqs > 0) edata->configure_reqs--; 1676 if (edata->configure_reqs > 0) edata->configure_reqs--;
1673 1677
1674 edata->configure_coming = 0;
1675 if ((e->from_wm) || (ee->prop.override)) 1678 if ((e->from_wm) || (ee->prop.override))
1676 { 1679 {
1677 if ((ee->x != e->x) || (ee->y != e->y)) 1680 if ((ee->x != e->x) || (ee->y != e->y))