mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xwm: Be careful with window size when minimizing

Browse Source 
If we're minimized from maximized or fullscreen state, we want to leave
the saved size alone, so we can restore it if we clear fullscreen or
maximized state later.

Signed-off-by: Hideyuki Nagase <hideyukn@microsoft.com>
This commit is contained in:
Derek Foreman 2023-01-31 16:47:48 -06:00 committed by Marius Vlad
parent 3560da1255
commit 9d24fb96fb
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
xwayland/window-manager.c
View File

@ -1927,8 +1927,14 @@ weston_wm_window_handle_iconic_state(struct weston_wm_window *window,
iconic_state = client_message->data.data32[0];
if (iconic_state == ICCCM_ICONIC_STATE) {
window->saved_height = window->height;
window->saved_width = window->width;
/* If window is currently in maximized or fullscreen state,
* don't override saved size.
*/
if (!weston_wm_window_is_maximized(window) &&
!window->fullscreen) {
window->saved_height = window->height;
window->saved_width = window->width;
}
xwayland_interface->set_minimized(window->shsurf);
}
}
@ -2297,8 +2303,14 @@ weston_wm_handle_button(struct weston_wm *wm, xcb_generic_event_t *event)
}
if (frame_status(window->frame) & FRAME_STATUS_MINIMIZE) {
window->saved_width = window->width;
window->saved_height = window->height;
/* If window is currently in maximized or fullscreen state,
* don't override saved size.
*/
if (!weston_wm_window_is_maximized(window) &&
!window->fullscreen) {
window->saved_width = window->width;
window->saved_height = window->height;
}
xwayland_interface->set_minimized(window->shsurf);
frame_status_clear(window->frame, FRAME_STATUS_MINIMIZE);
}