From: Kristian Høgsberg <krh@bitplanet.net>
Date: Fri, 17 Jan 2014 23:31:33 +0000 (-0800)
Subject: resizor: Don't resize if maximized
X-Git-Tag: upstream/0.1.8~499
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6f394d59a110c73599174eb3a5d80c98e9b86494;p=profile%2Fivi%2Fweston-ivi-shell.git

resizor: Don't resize if maximized

https://bugs.freedesktop.org/show_bug.cgi?id=73723
---

diff --git a/clients/resizor.c b/clients/resizor.c
index 9cf1a3c..b5ea55f 100644
--- a/clients/resizor.c
+++ b/clients/resizor.c
@@ -77,6 +77,14 @@ frame_callback(void *data, struct wl_callback *callback, uint32_t time)
 
 	assert(!callback || callback == resizor->frame_callback);
 
+	if (resizor->frame_callback) {
+		wl_callback_destroy(resizor->frame_callback);
+		resizor->frame_callback = NULL;
+	}
+
+	if (window_is_maximized(resizor->window))
+		return;
+
 	spring_update(&resizor->width);
 	spring_update(&resizor->height);
 
@@ -84,11 +92,6 @@ frame_callback(void *data, struct wl_callback *callback, uint32_t time)
 			       resizor->width.current + 0.5,
 			       resizor->height.current + 0.5);
 
-	if (resizor->frame_callback) {
-		wl_callback_destroy(resizor->frame_callback);
-		resizor->frame_callback = NULL;
-	}
-
 	if (!spring_done(&resizor->width) || !spring_done(&resizor->height)) {
 		resizor->frame_callback =
 			wl_surface_frame(