mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

shell: Unmap old backgrounds/panels when setting new ones

This commit is contained in:
Benjamin Franzke 2011-11-23 20:46:40 +01:00
parent d0f79ab5ab
commit f02bb64d62
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
compositor/shell.c
View File

@ -842,6 +842,15 @@ desktop_shell_set_background(struct wl_client *client,
struct wlsc_surface *surface = surface_resource->data;
struct shell_surface *priv;
wl_list_for_each(priv, &shell->backgrounds, link) {
if (priv->output == output_resource->data) {
priv->surface->output = NULL;
wl_list_remove(&priv->surface->link);
wl_list_remove(&priv->link);
break;
}
}
priv = get_shell_surface(surface);
priv->type = SHELL_SURFACE_BACKGROUND;
priv->output = output_resource->data;
@ -868,6 +877,15 @@ desktop_shell_set_panel(struct wl_client *client,
struct wlsc_surface *surface = surface_resource->data;
struct shell_surface *priv;
wl_list_for_each(priv, &shell->panels, link) {
if (priv->output == output_resource->data) {
priv->surface->output = NULL;
wl_list_remove(&priv->surface->link);
wl_list_remove(&priv->link);
break;
}
}
priv = get_shell_surface(surface);
priv->type = SHELL_SURFACE_PANEL;
priv->output = output_resource->data;