diff options
| author | Olivier Fourdan <ofourdan@redhat.com> | 2017-06-21 13:30:22 +0200 |
|---|---|---|
| committer | Olivier Fourdan <ofourdan@redhat.com> | 2018-01-11 11:03:04 +0100 |
| commit | 5f05112b9a66d6e12877d15db589acf4624ce4a6 (patch) | |
| tree | dbb87b77e9967d485d7ea94d6784ad2381bb5bc4 /src/wayland | |
| parent | 6cf7d2d47fb0263cd056f91bfc96020af95b1b4b (diff) | |
| download | mutter-5f05112b9a66d6e12877d15db589acf4624ce4a6.tar.gz | |
wayland: update location prior to maximize
When maximizing a window, the previous location is saved so that
un-maximize would restore the same original window location.
However, if a Wayland client starts with a window maximized, the
previous location will be 0x0, so if we have to force placement in
xdg_toplevel_set_maximized(), we should update the location as well so
that the window is placed on the right monitor when un-maximizing.
For that purpose, add a new flag to force the update of the window
location, and use that flag from xdg_toplevel_set_maximized().
https://bugzilla.gnome.org/show_bug.cgi?id=783901
Diffstat (limited to 'src/wayland')
| -rw-r--r-- | src/wayland/meta-wayland-xdg-shell.c | 5 | ||||
| -rw-r--r-- | src/wayland/meta-window-wayland.c | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/wayland/meta-wayland-xdg-shell.c b/src/wayland/meta-wayland-xdg-shell.c index 6d9a0d5cc..43b49231a 100644 --- a/src/wayland/meta-wayland-xdg-shell.c +++ b/src/wayland/meta-wayland-xdg-shell.c @@ -347,9 +347,10 @@ xdg_toplevel_set_maximized (struct wl_client *client, struct wl_resource *resource) { MetaWaylandSurface *surface = surface_from_xdg_toplevel_resource (resource); + MetaWindow *window = surface->window; - meta_window_force_placement (surface->window); - meta_window_maximize (surface->window, META_MAXIMIZE_BOTH); + meta_window_force_placement (window, TRUE); + meta_window_maximize (window, META_MAXIMIZE_BOTH); } static void diff --git a/src/wayland/meta-window-wayland.c b/src/wayland/meta-window-wayland.c index 5e451ca58..4d9aadbbb 100644 --- a/src/wayland/meta-window-wayland.c +++ b/src/wayland/meta-window-wayland.c @@ -232,7 +232,11 @@ meta_window_wayland_move_resize_internal (MetaWindow *window, * it can be for maximized or fullscreen. */ - if (flags & META_MOVE_RESIZE_WAYLAND_RESIZE) + if (flags & META_MOVE_RESIZE_FORCE_MOVE) + { + can_move_now = TRUE; + } + else if (flags & META_MOVE_RESIZE_WAYLAND_RESIZE) { /* This is a call to wl_surface_commit(), ignore the constrained_rect and * update the real client size to match the buffer size. @@ -762,7 +766,7 @@ meta_window_place_with_placement_rule (MetaWindow *window, window->unconstrained_rect.width = placement_rule->width; window->unconstrained_rect.height = placement_rule->height; - meta_window_force_placement (window); + meta_window_force_placement (window, FALSE); } void |