[PATCH] shell: don't assign output for surface of type none
Ander Conselvan de Oliveira
conselvan2 at gmail.com
Mon Mar 5 05:39:23 PST 2012
If map is called with a surface of type none it will call
weston_surface_assign_output, even though the surface will
not be mapped.
This change was lost with the changes for using wl_layers.
---
src/shell.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/shell.c b/src/shell.c
index ac7301a..2611316 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -1603,10 +1603,12 @@ map(struct weston_shell *base, struct weston_surface *surface,
break;
}
- weston_surface_assign_output(surface);
- weston_compositor_repick(compositor);
- if (surface_type == SHELL_SURFACE_MAXIMIZED)
- surface->output = shsurf->output;
+ if (surface_type != SHELL_SURFACE_NONE) {
+ weston_surface_assign_output(surface);
+ weston_compositor_repick(compositor);
+ if (surface_type == SHELL_SURFACE_MAXIMIZED)
+ surface->output = shsurf->output;
+ }
switch (surface_type) {
case SHELL_SURFACE_TOPLEVEL:
--
1.7.5.4
More information about the wayland-devel
mailing list