summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Bradford <rob@linux.intel.com>2012-12-06 12:07:48 +0000
committerKristian Høgsberg <krh@bitplanet.net>2012-12-11 23:48:01 -0500
commitba84e7e1669b94d202dc20bdf4a7a88377790b66 (patch)
tree564c5e996d937086b3e996fd8c63ca3534e58744
parent0b7b8982891a06e4a6008f699c07b732e456de8c (diff)
downloadweston-ba84e7e1669b94d202dc20bdf4a7a88377790b66.tar.gz
shell: Remove confusing case fall-through
This avoids calling weston_surface_set_position twice on the same surface. The second call has no effect in many cases because sx and sy are usually zero on this path. This change now means that any sx/sy values passed into ::attach will be ignored on the first attach for popup surfaces. This similar to the behaviour for other surface types.
-rw-r--r--src/shell.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/shell.c b/src/shell.c
index 93139604..f8cee0ec 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -2920,6 +2920,7 @@ map(struct desktop_shell *shell, struct weston_surface *surface,
break;
case SHELL_SURFACE_POPUP:
shell_map_popup(shsurf);
+ break;
case SHELL_SURFACE_NONE:
weston_surface_set_position(surface,
surface->geometry.x + sx,