mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-04 13:30:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

view:c Do not overwrite unmaximized dimensions on fullscreen

Browse source 
Before: window -> maximize -> fullscreen -> unfullscreen would reset pre maximized state
Now: window -> maximize -> fullscreen -> unfullscreen -> unmaximize works as expected
This commit is contained in:
Consolatis 2021-12-28 00:55:34 +01:00 • committed by ARDiDo
parent 310c36c86d
commit 4b2a7a28c6
1 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/view.c
View file

@ -223,10 +223,12 @@ view_set_fullscreen(struct view *view, bool fullscreen,
view->toplevel_handle, fullscreen); view->toplevel_handle, fullscreen);
} }
if (fullscreen) { if (fullscreen) {
view->unmaximized_geometry.x = view->x; if (!view->maximized) {
view->unmaximized_geometry.y = view->y; view->unmaximized_geometry.x = view->x;
view->unmaximized_geometry.width = view->w; view->unmaximized_geometry.y = view->y;
view->unmaximized_geometry.height = view->h; view->unmaximized_geometry.width = view->w;
view->unmaximized_geometry.height = view->h;
}
if (!wlr_output) { if (!wlr_output) {
wlr_output = view_wlr_output(view); wlr_output = view_wlr_output(view);
@ -245,7 +247,16 @@ view_set_fullscreen(struct view *view, bool fullscreen,
view_move_resize(view, box); view_move_resize(view, box);
} else { } else {
/* restore to normal */ /* restore to normal */
view_move_resize(view, view->unmaximized_geometry); if (view->maximized) {
view->maximized = false;
view->x = view->unmaximized_geometry.x;
view->y = view->unmaximized_geometry.y;
view->w = view->unmaximized_geometry.width;
view->h = view->unmaximized_geometry.height;
view_maximize(view, true);
} else {
view_move_resize(view, view->unmaximized_geometry);
}
view->fullscreen = false; view->fullscreen = false;
} }
} }