diff options
| author | Quentin Glidic <sardemff7+git@sardemff7.net> | 2016-08-16 14:26:20 +0200 |
|---|---|---|
| committer | Quentin Glidic <sardemff7+git@sardemff7.net> | 2016-09-07 12:21:09 +0200 |
| commit | 920cf048f36b1aa5bb121de809ac37b900baf3e0 (patch) | |
| tree | 561e500acfb013d846bec4a9294e890eba06ebc3 | |
| parent | 18a81acc17f7d8e49db3ab3f4827252114a4899a (diff) | |
desktop-shell: Add back the saved position and rotation for fullscreen/maximized
Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Reviewed-by: Jonas Ådahl <jadahl@gmail.com>
| -rw-r--r-- | desktop-shell/shell.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c index 35dbbaa2..a43c2e2a 100644 --- a/desktop-shell/shell.c +++ b/desktop-shell/shell.c @@ -1950,14 +1950,13 @@ unset_fullscreen(struct shell_surface *shsurf) shsurf->saved_x, shsurf->saved_y); else weston_view_set_initial_position(shsurf->view, shsurf->shell); + shsurf->saved_position_valid = false; if (shsurf->saved_rotation_valid) { wl_list_insert(&shsurf->view->geometry.transformation_list, &shsurf->rotation.transform.link); shsurf->saved_rotation_valid = false; } - - /* Layer is updated in set_surface_type(). */ } static void @@ -1974,14 +1973,13 @@ unset_maximized(struct shell_surface *shsurf) shsurf->saved_x, shsurf->saved_y); else weston_view_set_initial_position(shsurf->view, shsurf->shell); + shsurf->saved_position_valid = false; if (shsurf->saved_rotation_valid) { wl_list_insert(&shsurf->view->geometry.transformation_list, &shsurf->rotation.transform.link); shsurf->saved_rotation_valid = false; } - - /* Layer is updated in set_surface_type(). */ } static void @@ -2490,6 +2488,20 @@ desktop_surface_committed(struct weston_desktop_surface *desktop_surface, if (was_maximized) unset_maximized(shsurf); + if ((shsurf->state.fullscreen || shsurf->state.maximized) && + !shsurf->saved_position_valid) { + shsurf->saved_x = shsurf->view->geometry.x; + shsurf->saved_y = shsurf->view->geometry.y; + shsurf->saved_position_valid = true; + + if (!wl_list_empty(&shsurf->rotation.transform.link)) { + wl_list_remove(&shsurf->rotation.transform.link); + wl_list_init(&shsurf->rotation.transform.link); + weston_view_geometry_dirty(shsurf->view); + shsurf->saved_rotation_valid = true; + } + } + if (shsurf->state.fullscreen) { shell_configure_fullscreen(shsurf); } else if (shsurf->state.maximized) { |