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

snap: cache and ignore last-snapped edge when growing or shrinking

Browse source 
When growing or shrinking a view by snapping to an edge, a client may
ignore the requested size and instead keep its original size or
substitute a different (possibly constrained) size. In this case, the
view may not actually contact the snapped edge, and a subsequent snap
attempt will just keep re-trying (and failing) to contact the same ege.

To mitigate this, remember the last-snapped view, snapping direction and
offset of the snapping edge in snap.c; when re-attempting a snap for the
same view in the same direction, ignore the edge that was last "hit", to
allow snapping to progress beyond the problematic edge.
This commit is contained in:
Andrew J. Hesford 2024-04-02 15:58:50 -04:00 • committed by Johan Malm
parent 9de487cecf
commit 2bf285a2c6
11 changed files with 271 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

49
src/snap.c
View file

@ -4,10 +4,9 @@
#include <wlr/util/box.h>
#include "common/border.h"
#include "common/macros.h"
#include "config/rcxml.h"
#include "edges.h"
#include "labwc.h"
#include "resistance.h"
#include "snap-constraints.h"
#include "snap.h"
#include "view.h"
@ -121,9 +120,8 @@ snap_move_to_edge(struct view *view, enum view_edge direction,
struct border next_edges;
edges_initialize(&next_edges);
edges_find_neighbors(&next_edges,
view, target, output, check_edge,
/* use_pending */ true, /* ignore_hidden */ false);
edges_find_neighbors(&next_edges, view, view->pending, target,
output, check_edge, /* ignore_hidden */ false);
/* If any "best" edges were encountered, limit motion */
edges_adjust_move_coords(view, next_edges,
@ -135,8 +133,8 @@ snap_move_to_edge(struct view *view, enum view_edge direction,
}
void
snap_grow_to_next_edge(struct view *view, enum view_edge direction,
struct wlr_box *geo)
snap_grow_to_next_edge(struct view *view,
enum view_edge direction, struct wlr_box *geo)
{
assert(view);
assert(!view->shaded);
@ -196,17 +194,26 @@ snap_grow_to_next_edge(struct view *view, enum view_edge direction,
struct border next_edges;
edges_initialize(&next_edges);
/* Use a constrained, effective geometry for snapping if appropriate */
struct wlr_box origin = snap_constraints_effective(view, direction);
/* Limit motion to any intervening edge of other views on this output */
edges_find_neighbors(&next_edges,
view, *geo, output, check_edge,
/* use_pending */ true, /* ignore_hidden */ false);
edges_find_neighbors(&next_edges, view, origin, *geo,
output, check_edge, /* ignore_hidden */ false);
edges_adjust_resize_geom(view, next_edges,
resize_edges, geo, /* use_pending */ true);
/*
* Record effective geometry after snapping in case the client opts to
* ignore or modify the configured geometry
*/
snap_constraints_set(view, direction, *geo);
}
void
snap_shrink_to_next_edge(struct view *view, enum view_edge direction,
struct wlr_box *geo)
snap_shrink_to_next_edge(struct view *view,
enum view_edge direction, struct wlr_box *geo)
{
assert(view);
assert(!view->shaded);
@ -252,15 +259,23 @@ snap_shrink_to_next_edge(struct view *view, enum view_edge direction,
struct border next_edges;
edges_initialize(&next_edges);
/* Use a constrained, effective geometry for snapping if appropriate */
struct wlr_box origin = snap_constraints_effective(view, direction);
/* Snap to output edges if the moving edge started off-screen */
edges_find_outputs(&next_edges, view, *geo,
view->output, check_edge, /* use_pending */ true);
edges_find_outputs(&next_edges, view,
origin, *geo, view->output, check_edge);
/* Limit motion to any intervening edge of ther views on this output */
edges_find_neighbors(&next_edges,
view, *geo, view->output, check_edge,
/* use_pending */ true, /* ignore_hidden */ false);
edges_find_neighbors(&next_edges, view, origin, *geo,
view->output, check_edge, /* ignore_hidden */ false);
edges_adjust_resize_geom(view, next_edges,
resize_edges, geo, /* use_pending */ true);
/*
* Record effective geometry after snapping in case the client opts to
* ignore or modify the configured geometry
*/
snap_constraints_set(view, direction, *geo);
}