commit 65f98d8c2fbd251fe9e3c4b90deb764d4282cc27
author Rafael Antognolli <rafael.antognolli@intel.com> Tue Dec 03 15:35:47 2013 -0200
committer Kristian Høgsberg <krh@bitplanet.net> Tue Dec 03 12:57:01 2013 -0800
tree ce1763eef22071ea450cc3b612b577621f707b79
parent 3c4e3f7cc714b4750257496fc283bb58a24c7a38

xdg-shell: xdg_surface_set_output should only affect fullscreen.

src/shell.c

diff --git a/src/shell.c b/src/shell.c
index 76dc557..a2fcf3d 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -339,6 +339,7 @@
 
 	struct weston_output *fullscreen_output;
 	struct weston_output *output;
+	struct weston_output *recommended_output;
 	struct wl_list link;
 
 	const struct weston_shell_client *client;
@@ -3295,8 +3296,7 @@
 	else
 		output = NULL;
 
-	if (!weston_surface_is_mapped(shsurf->surface))
-		shsurf->output = output;
+	shsurf->recommended_output = output;
 }
 
 static void
@@ -3313,7 +3313,7 @@
 		shsurf->state_changed = true;
 		set_fullscreen(shsurf,
 			       WL_SHELL_SURFACE_FULLSCREEN_METHOD_DEFAULT,
-			       0, shsurf->output);
+			       0, shsurf->recommended_output);
 	}
 }
 
@@ -3358,7 +3358,7 @@
 	if (!shsurf->next_state.maximized) {
 		shsurf->next_state.maximized = true;
 		shsurf->state_changed = true;
-		set_maximized(shsurf, shsurf->output);
+		set_maximized(shsurf, NULL);
 	}
 }