summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Withnall <philip.withnall@collabora.co.uk>2013-11-25 18:01:39 +0000
committerKristian Høgsberg <krh@bitplanet.net>2013-12-02 11:44:50 -0800
commitb995e1d0531ba7156e1319002dafed80a7ca2a09 (patch)
treea1adfbb68a8eccb20dea330a4bed8ff29429a467
parentdc4332f1ff4dc9a716ea8ed816a5de1590ba232d (diff)
shell: Don’t change popups’ window types until the next configure event
This standardises their behaviour with that of the other window types, where the type change is only committed on configure.
-rw-r--r--src/shell.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/shell.c b/src/shell.c
index e9d733c1..2bfc463e 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -2192,13 +2192,14 @@ set_popup(struct shell_surface *shsurf,
{
assert(parent != NULL);
- shsurf->type = SHELL_SURFACE_POPUP;
shsurf->popup.shseat = get_shell_seat(seat);
shsurf->popup.serial = serial;
shsurf->popup.x = x;
shsurf->popup.y = y;
shell_surface_set_parent(shsurf, parent);
+
+ shsurf->next_type = SHELL_SURFACE_POPUP;
}
static void