From: Chris Michael Date: Thu, 15 Jun 2017 17:08:39 +0000 (-0400) Subject: Revert "ecore-evas-wayland: Add support for setting window stack mode" X-Git-Tag: upstream/1.20.0~527 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=09375bf5b58b641932ee9ede0267b8de81352e06;p=platform%2Fupstream%2Fefl.git Revert "ecore-evas-wayland: Add support for setting window stack mode" This commit reverts support for setting window stacking mode from ecore_evas_wayland as per IRC dicussion with cedric This reverts commit a3cf0d3a54f54cccfb48dc2234dada147c30f419. --- diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c index 54462a6..16a6c98 100644 --- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c +++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c @@ -1456,46 +1456,6 @@ _ecore_evas_wl_common_object_cursor_set(Ecore_Evas *ee, Evas_Object *obj, int la } static void -_ecore_evas_wl_common_layer_update(Ecore_Evas *ee) -{ - Ecore_Evas_Engine_Wl_Data *wdata; - - wdata = ee->engine.data; - if (!wdata) return; - - if (ee->prop.layer < 3) - { - if ((wdata->stack.above) || (!wdata->stack.below)) - { - wdata->stack.above = EINA_FALSE; - wdata->stack.below = EINA_TRUE; - ecore_wl2_window_stack_mode_set(wdata->win, - ECORE_WL2_WINDOW_STACK_BELOW); - } - } - else if (ee->prop.layer > 5) - { - if ((!wdata->stack.above) || (wdata->stack.below)) - { - wdata->stack.above = EINA_TRUE; - wdata->stack.below = EINA_FALSE; - ecore_wl2_window_stack_mode_set(wdata->win, - ECORE_WL2_WINDOW_STACK_ABOVE); - } - } - else - { - if ((wdata->stack.above) || (wdata->stack.below)) - { - wdata->stack.above = EINA_FALSE; - wdata->stack.below = EINA_FALSE; - ecore_wl2_window_stack_mode_set(wdata->win, - ECORE_WL2_WINDOW_STACK_NONE); - } - } -} - -static void _ecore_evas_wl_common_layer_set(Ecore_Evas *ee, int layer) { LOGFN(__FILE__, __LINE__, __FUNCTION__); @@ -1505,7 +1465,6 @@ _ecore_evas_wl_common_layer_set(Ecore_Evas *ee, int layer) if (layer < 1) layer = 1; else if (layer > 255) layer = 255; ee->prop.layer = layer; - _ecore_evas_wl_common_layer_update(ee); _ecore_evas_wl_common_state_update(ee); } diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h index 5aa319c..e6e3f3e 100644 --- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h +++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h @@ -57,12 +57,6 @@ struct _Ecore_Evas_Engine_Wl_Data Ecore_Job *manual_mode_job; } wm_rot; - struct - { - Eina_Bool above : 1; - Eina_Bool below : 1; - } stack; - Eina_Bool dragging : 1; Eina_Bool sync_done : 1; Eina_Bool defer_show : 1;