mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compositor: allow using nested parent as a subsurface sibling

Browse Source 
The parent of a subsurface can be used as a sibling in the place_below
and place_above calls. However this did not work when the parent is
nested, so fix the sibling check and add a test to check this case.

Signed-off-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
Arnaud Vrac
2016-06-08 18:37:57 +02:00
committed by Daniel Stone
parent 11f8fcbefe
commit b8c16c995b
2 changed files with 54 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/subsurface-test.c
+44
View File
@@ -250,6 +250,50 @@ TEST(test_subsurface_loop_paradox)
WL_SUBCOMPOSITOR_ERROR_BAD_SURFACE);
}
TEST(test_subsurface_place_above_nested_parent)
{
struct client *client;
struct compound_surface com;
struct wl_surface *grandchild;
struct wl_subcompositor *subco;
struct wl_subsurface *sub;
client = create_client_and_test_surface(100, 50, 123, 77);
assert(client);
populate_compound_surface(&com, client);
subco = get_subcompositor(client);
grandchild = wl_compositor_create_surface(client->wl_compositor);
sub = wl_subcompositor_get_subsurface(subco, grandchild, com.child[0]);
wl_subsurface_place_above(sub, com.child[0]);
client_roundtrip(client);
}
TEST(test_subsurface_place_below_nested_parent)
{
struct client *client;
struct compound_surface com;
struct wl_subcompositor *subco;
struct wl_surface *grandchild;
struct wl_subsurface *sub;
client = create_client_and_test_surface(100, 50, 123, 77);
assert(client);
populate_compound_surface(&com, client);
subco = get_subcompositor(client);
grandchild = wl_compositor_create_surface(client->wl_compositor);
sub = wl_subcompositor_get_subsurface(subco, grandchild, com.child[0]);
wl_subsurface_place_below(sub, com.child[0]);
client_roundtrip(client);
}
TEST(test_subsurface_place_above_stranger)
{
struct client *client;