From c2745b14f091e51646f9cd865dbda4ba72fb7408 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Thu, 5 Dec 2013 22:00:40 -0800 Subject: [PATCH] desktop-shell: Set maximized flags in common code path We can set the maximized and state_changed flags in set_maximized(), which is shared between shell_surface_set_maximized() and xdg_surface_set_maximized(). --- desktop-shell/shell.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c index 632579ff..a8279805 100644 --- a/desktop-shell/shell.c +++ b/desktop-shell/shell.c @@ -2304,6 +2304,8 @@ set_maximized(struct shell_surface *shsurf, shsurf->output->width, shsurf->output->height - panel_height); + shsurf->next_state.maximized = true; + shsurf->state_changed = true; shsurf->next_type = SHELL_SURFACE_TOPLEVEL; } @@ -2341,8 +2343,6 @@ shell_surface_set_maximized(struct wl_client *client, shell_surface_set_parent(shsurf, NULL); surface_clear_next_states(shsurf); - shsurf->next_state.maximized = true; - shsurf->state_changed = true; set_maximized(shsurf, output); } @@ -3169,11 +3169,8 @@ xdg_surface_set_maximized(struct wl_client *client, if (shsurf->type != SHELL_SURFACE_TOPLEVEL) return; - if (!shsurf->next_state.maximized) { - shsurf->next_state.maximized = true; - shsurf->state_changed = true; + if (!shsurf->next_state.maximized) set_maximized(shsurf, NULL); - } } static void