enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 12 Pull Requests 2 Projects Releases Wiki Activity

ecore-wl2: Fix setting opaque region on a window 

Previous code here would store incorrect values into the
window->opaque rectangle. These values should be what is actually
getting set in the wl_region. This code also fixes an issue when
setting opaque region for transparent/alpha windows by clearing out
any pending opaque region (wl_surface_set_opaque_region(surface, null)).

Reviewed-By: Derek Foreman <derekf@osg.samsung.com>

@fix

Signed-off-by: Chris Michael <cp.michael@samsung.com>
This commit is contained in:
Chris Michael 2017-02-14 09:58:49 -05:00
parent b8beb6834b
commit 559490d756
1 changed files with 40 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/lib/ecore_wl2/ecore_wl2_window.c
View File

@ -880,18 +880,46 @@ ecore_wl2_window_opaque_region_set(Ecore_Wl2_Window *window, int x, int y, int w
EINA_SAFETY_ON_NULL_RETURN(window);
if ((window->opaque.x == x) && (window->opaque.y == y) &&
(window->opaque.w == w) && (window->opaque.h == h))
return;
if ((x == 0) && (y == 0) && (w == 0) && (h == 0))
{
if (window->surface)
wl_surface_set_opaque_region(window->surface, NULL);
return;
}
window->opaque.x = x;
window->opaque.y = y;
window->opaque.w = w;
window->opaque.h = h;
window->opaque_set = 1;
switch (window->rotation)
{
case 0:
window->opaque.x = x;
window->opaque.y = y;
window->opaque.w = w;
window->opaque.h = h;
break;
case 90:
window->opaque.x = y;
window->opaque.y = x;
window->opaque.w = h;
window->opaque.h = w;
break;
case 180:
window->opaque.x = x;
window->opaque.y = x + y;
window->opaque.w = w;
window->opaque.h = h;
break;
case 270:
window->opaque.x = x + y;
window->opaque.y = x;
window->opaque.w = h;
window->opaque.h = w;
break;
default:
break;
}
if ((window->transparent) || (window->alpha)) return;
if (!window->surface) return; //surface not created yet
window->opaque_set = EINA_TRUE;
if (!window->surface) return;
region = wl_compositor_create_region(window->display->wl.compositor);
if (!region)
@ -900,22 +928,8 @@ ecore_wl2_window_opaque_region_set(Ecore_Wl2_Window *window, int x, int y, int w
return;
}
switch (window->rotation)
{
case 0:
wl_region_add(region, x, y, w, h);
break;
case 180:
wl_region_add(region, x, x + y, w, h);
break;
case 90:
wl_region_add(region, y, x, h, w);
break;
case 270:
wl_region_add(region, x + y, x, h, w);
break;
}
wl_region_add(region, window->opaque.x, window->opaque.y,
window->opaque.w, window->opaque.h);
wl_surface_set_opaque_region(window->surface, region);
wl_region_destroy(region);
}