summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDerek Foreman <derekf@osg.samsung.com>2018-02-12 14:39:36 -0600
committerDerek Foreman <derekf@osg.samsung.com>2018-04-20 13:00:27 -0500
commit5af84afced98956198b9c316facb671e46b381c1 (patch)
tree86c5b1a30dc0dec228deb360236e2edefdfca941
parentd20c0bf9647da64bbbe74ff9352ebfdd4999d999 (diff)
downloadefl-5af84afced98956198b9c316facb671e46b381c1.tar.gz
ecore_evas_wayland: Replace transparent_set with alpha_set
transparent_set is a legacy path that should do exactly what alpha_set does these days, so squash them into the same function.
-rw-r--r--src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c50
1 files changed, 1 insertions, 49 deletions
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 320b194a6e..7dd5c54e64 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
@@ -1849,36 +1849,6 @@ _ecore_evas_wayland_alpha_do(Ecore_Evas *ee, int alpha)
}
static void
-_ecore_evas_wayland_transparent_do(Ecore_Evas *ee, int transparent)
-{
- Evas_Engine_Info_Wayland *einfo;
- Ecore_Evas_Engine_Wl_Data *wdata;
- int fw, fh;
-
- LOGFN(__FILE__, __LINE__, __FUNCTION__);
-
- if (!ee) return;
- if (ee->transparent == transparent) return;
- ee->transparent = transparent;
-
- wdata = ee->engine.data;
- if (!wdata->sync_done) return;
-
- if (wdata->win)
- ecore_wl2_window_transparent_set(wdata->win, ee->transparent);
-
- evas_output_framespace_get(ee->evas, NULL, NULL, &fw, &fh);
-
- if ((einfo = (Evas_Engine_Info_Wayland *)evas_engine_info_get(ee->evas)))
- {
- einfo->info.destination_alpha = EINA_TRUE;
- if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
- ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
- evas_damage_rectangle_add(ee->evas, 0, 0, ee->w + fw, ee->h + fh);
- }
-}
-
-static void
_ecore_evas_wl_common_render_updates(void *data, Evas *evas EINA_UNUSED, void *event EINA_UNUSED)
{
Ecore_Evas *ee = data;
@@ -1888,11 +1858,6 @@ _ecore_evas_wl_common_render_updates(void *data, Evas *evas EINA_UNUSED, void *e
_ecore_evas_wayland_alpha_do(ee, ee->delayed.alpha);
ee->delayed.alpha_changed = EINA_FALSE;
}
- if (ee->delayed.transparent_changed)
- {
- _ecore_evas_wayland_transparent_do(ee, ee->delayed.transparent);
- ee->delayed.transparent_changed = EINA_FALSE;
- }
if (ee->delayed.rotation_changed)
{
_rotation_do(ee, ee->delayed.rotation, ee->delayed.rotation_resize);
@@ -2211,19 +2176,6 @@ _ecore_evas_wl_common_alpha_set(Ecore_Evas *ee, int alpha)
}
static void
-_ecore_evas_wl_common_transparent_set(Ecore_Evas *ee, int transparent)
-{
- if (ee->in_async_render)
- {
- ee->delayed.transparent = transparent;
- ee->delayed.transparent_changed = EINA_TRUE;
- return;
- }
-
- _ecore_evas_wayland_transparent_do(ee, transparent);
-}
-
-static void
_ecore_evas_wl_common_rotation_set(Ecore_Evas *ee, int rotation, int resize)
{
LOGFN(__FILE__, __LINE__, __FUNCTION__);
@@ -2402,7 +2354,7 @@ static Ecore_Evas_Engine_Func _ecore_wl_engine_func =
NULL, // func sticky set
_ecore_evas_wl_common_ignore_events_set,
_ecore_evas_wl_common_alpha_set,
- _ecore_evas_wl_common_transparent_set,
+ _ecore_evas_wl_common_alpha_set, // transparent set
NULL, // func profiles set
NULL, // func profile set
NULL, // window group set