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

desktop-shell: Make set_toplevel() clear surface states

Browse Source 
This is used from wl_shell and xwayland and we need to make sure
xwayland also gets this behavior.
This commit is contained in:
Kristian Høgsberg
2013-12-05 22:31:25 -08:00
parent e960b3f012
commit 41fbf6f7fd
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop-shell/shell.c
+2 -3
View File
@@ -2121,6 +2121,8 @@ surface_clear_next_states(struct shell_surface *shsurf)
static void static void
set_toplevel(struct shell_surface *shsurf) set_toplevel(struct shell_surface *shsurf)
{ {
shell_surface_set_parent(shsurf, NULL);
surface_clear_next_states(shsurf);
shsurf->next_type = SHELL_SURFACE_TOPLEVEL; shsurf->next_type = SHELL_SURFACE_TOPLEVEL;
/* The layer_link is updated in set_surface_type(), /* The layer_link is updated in set_surface_type(),
@@ -2133,9 +2135,6 @@ shell_surface_set_toplevel(struct wl_client *client,
{ {
struct shell_surface *surface = wl_resource_get_user_data(resource); struct shell_surface *surface = wl_resource_get_user_data(resource);
shell_surface_set_parent(surface, NULL);
surface_clear_next_states(surface);
set_toplevel(surface); set_toplevel(surface);
} }