mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-01 22:58:47 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

interactive: Refactor natural_geometry/tiled state handling

Browse source 
Currently, snapping to a screen edge and then snapping to maximize
results in both the natural_geometry and tiled state of the view
getting messed up. After unmaximize, the view ends up in a weird
state (tiled location but natural/untiled size).

There are also a couple of sketchy things going on in the code:

- interactive_begin() pokes its own values into view->natural_geometry
  to force view_maximize() to set a particular geometry.

- interactive_end() "fixes" view->natural_geometry after calling
  view_maximize() to save the original geometry from the start of the
  interactive move/resize.

To fix all this:

- Adjust/expand the API of view.c so that the interactive.c can
  avoid this "back door" of overwriting view->natural_geometry
  directly.

- Save the natural geometry and the tiled state of the view in
  interactive_begin() when starting to move the view.  When done,
  interactive_end() will update the tiled state if appropriate but
  *not* overwrite the natural geometry.
This commit is contained in:
John Lindgren 2022-11-19 12:58:52 -05:00 • committed by Johan Malm
parent 636b38561b
commit 9021020f6e
7 changed files with 192 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

69
src/view.c
View file

@ -308,7 +308,7 @@ set_fallback_geometry(struct view *view)
#undef LAB_FALLBACK_WIDTH
#undef LAB_FALLBACK_HEIGHT
static void
void
view_store_natural_geometry(struct view *view)
{
/**
@ -423,8 +423,37 @@ view_apply_unmaximized_geometry(struct view *view)
}
}
static void
set_maximized(struct view *view, bool maximized)
{
if (view->impl->maximize) {
view->impl->maximize(view, maximized);
}
if (view->toplevel_handle) {
wlr_foreign_toplevel_handle_v1_set_maximized(
view->toplevel_handle, maximized);
}
view->maximized = maximized;
}
/*
* Un-maximize view and move it to specific geometry. Does not reset
* tiled state (set view->tiled = 0 manually if you want that).
*/
void
view_maximize(struct view *view, bool maximize)
view_restore_to(struct view *view, struct wlr_box geometry)
{
if (view->fullscreen) {
return;
}
if (view->maximized) {
set_maximized(view, false);
}
view_move_resize(view, geometry);
}
void
view_maximize(struct view *view, bool maximize, bool store_natural_geometry)
{
if (view->maximized == maximize) {
return;
@ -432,20 +461,18 @@ view_maximize(struct view *view, bool maximize)
if (view->fullscreen) {
return;
}
if (view->impl->maximize) {
view->impl->maximize(view, maximize);
}
if (view->toplevel_handle) {
wlr_foreign_toplevel_handle_v1_set_maximized(
view->toplevel_handle, maximize);
}
set_maximized(view, maximize);
if (maximize) {
interactive_end(view);
if (!view->tiled) {
/*
* Maximize via keybind or client request cancels
* interactive move/resize since we can't move/resize
* a maximized view.
*/
interactive_cancel(view);
if (!view->tiled && store_natural_geometry) {
view_store_natural_geometry(view);
}
view_apply_maximized_geometry(view);
view->maximized = true;
} else {
/* unmaximize */
if (view->tiled) {
@ -453,14 +480,14 @@ view_maximize(struct view *view, bool maximize)
} else {
view_apply_unmaximized_geometry(view);
}
view->maximized = false;
}
}
void
view_toggle_maximize(struct view *view)
{
view_maximize(view, !view->maximized);
view_maximize(view, !view->maximized,
/*store_natural_geometry*/ true);
}
void
@ -526,7 +553,12 @@ view_set_fullscreen(struct view *view, bool fullscreen,
wlr_output = view_wlr_output(view);
}
if (fullscreen) {
interactive_end(view);
/*
* Fullscreen via keybind or client request cancels
* interactive move/resize since we can't move/resize
* a fullscreen view.
*/
interactive_cancel(view);
if (!view->maximized && !view->tiled) {
view_store_natural_geometry(view);
}
@ -697,7 +729,8 @@ view_edge_parse(const char *direction)
}
void
view_snap_to_edge(struct view *view, const char *direction)
view_snap_to_edge(struct view *view, const char *direction,
bool store_natural_geometry)
{
if (!view) {
wlr_log(WLR_ERROR, "no view");
@ -754,8 +787,8 @@ view_snap_to_edge(struct view *view, const char *direction)
if (view->maximized) {
/* Unmaximize + keep using existing natural_geometry */
view_maximize(view, false);
} else if (!view->tiled) {
view_maximize(view, false, /*store_natural_geometry*/ false);
} else if (!view->tiled && store_natural_geometry) {
/* store current geometry as new natural_geometry */
view_store_natural_geometry(view);
}