From 6f394d59a110c73599174eb3a5d80c98e9b86494 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Kristian=20H=C3=B8gsberg?= Date: Fri, 17 Jan 2014 15:31:33 -0800 Subject: [PATCH] resizor: Don't resize if maximized https://bugs.freedesktop.org/show_bug.cgi?id=73723 --- clients/resizor.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) 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( -- 2.7.4