summaryrefslogtreecommitdiff
path: root/src
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 /src
parentd20c0bf9647da64bbbe74ff9352ebfdd4999d999 (diff)
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.
Diffstat (limited to 'src')
-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)
1849} 1849}
1850 1850
1851static void 1851static void
1852_ecore_evas_wayland_transparent_do(Ecore_Evas *ee, int transparent)
1853{
1854 Evas_Engine_Info_Wayland *einfo;
1855 Ecore_Evas_Engine_Wl_Data *wdata;
1856 int fw, fh;
1857
1858 LOGFN(__FILE__, __LINE__, __FUNCTION__);
1859
1860 if (!ee) return;
1861 if (ee->transparent == transparent) return;
1862 ee->transparent = transparent;
1863
1864 wdata = ee->engine.data;
1865 if (!wdata->sync_done) return;
1866
1867 if (wdata->win)
1868 ecore_wl2_window_transparent_set(wdata->win, ee->transparent);
1869
1870 evas_output_framespace_get(ee->evas, NULL, NULL, &fw, &fh);
1871
1872 if ((einfo = (Evas_Engine_Info_Wayland *)evas_engine_info_get(ee->evas)))
1873 {
1874 einfo->info.destination_alpha = EINA_TRUE;
1875 if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
1876 ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
1877 evas_damage_rectangle_add(ee->evas, 0, 0, ee->w + fw, ee->h + fh);
1878 }
1879}
1880
1881static void
1882_ecore_evas_wl_common_render_updates(void *data, Evas *evas EINA_UNUSED, void *event EINA_UNUSED) 1852_ecore_evas_wl_common_render_updates(void *data, Evas *evas EINA_UNUSED, void *event EINA_UNUSED)
1883{ 1853{
1884 Ecore_Evas *ee = data; 1854 Ecore_Evas *ee = data;
@@ -1888,11 +1858,6 @@ _ecore_evas_wl_common_render_updates(void *data, Evas *evas EINA_UNUSED, void *e
1888 _ecore_evas_wayland_alpha_do(ee, ee->delayed.alpha); 1858 _ecore_evas_wayland_alpha_do(ee, ee->delayed.alpha);
1889 ee->delayed.alpha_changed = EINA_FALSE; 1859 ee->delayed.alpha_changed = EINA_FALSE;
1890 } 1860 }
1891 if (ee->delayed.transparent_changed)
1892 {
1893 _ecore_evas_wayland_transparent_do(ee, ee->delayed.transparent);
1894 ee->delayed.transparent_changed = EINA_FALSE;
1895 }
1896 if (ee->delayed.rotation_changed) 1861 if (ee->delayed.rotation_changed)
1897 { 1862 {
1898 _rotation_do(ee, ee->delayed.rotation, ee->delayed.rotation_resize); 1863 _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)
2211} 2176}
2212 2177
2213static void 2178static void
2214_ecore_evas_wl_common_transparent_set(Ecore_Evas *ee, int transparent)
2215{
2216 if (ee->in_async_render)
2217 {
2218 ee->delayed.transparent = transparent;
2219 ee->delayed.transparent_changed = EINA_TRUE;
2220 return;
2221 }
2222
2223 _ecore_evas_wayland_transparent_do(ee, transparent);
2224}
2225
2226static void
2227_ecore_evas_wl_common_rotation_set(Ecore_Evas *ee, int rotation, int resize) 2179_ecore_evas_wl_common_rotation_set(Ecore_Evas *ee, int rotation, int resize)
2228{ 2180{
2229 LOGFN(__FILE__, __LINE__, __FUNCTION__); 2181 LOGFN(__FILE__, __LINE__, __FUNCTION__);
@@ -2402,7 +2354,7 @@ static Ecore_Evas_Engine_Func _ecore_wl_engine_func =
2402 NULL, // func sticky set 2354 NULL, // func sticky set
2403 _ecore_evas_wl_common_ignore_events_set, 2355 _ecore_evas_wl_common_ignore_events_set,
2404 _ecore_evas_wl_common_alpha_set, 2356 _ecore_evas_wl_common_alpha_set,
2405 _ecore_evas_wl_common_transparent_set, 2357 _ecore_evas_wl_common_alpha_set, // transparent set
2406 NULL, // func profiles set 2358 NULL, // func profiles set
2407 NULL, // func profile set 2359 NULL, // func profile set
2408 NULL, // window group set 2360 NULL, // window group set