mirror of
https://gitlab.freedesktop.org/wayland/weston
synced 2024-07-21 10:44:25 +00:00
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().
This commit is contained in:
parent
acdae2e641
commit
c2745b14f0
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue