From: Philip Withnall <philip.withnall@collabora.co.uk>
Date: Mon, 25 Nov 2013 18:01:39 +0000 (+0000)
Subject: shell: Don’t change popups’ window types until the next configure event
X-Git-Tag: upstream/0.1.8~666
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b995e1d0531ba7156e1319002dafed80a7ca2a09;p=profile%2Fivi%2Fweston-ivi-shell.git

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.
---

diff --git a/src/shell.c b/src/shell.c
index e9d733c..2bfc463 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