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

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

20
src/edges.c
View file

@ -376,8 +376,8 @@ edges_calculate_visibility(struct server *server, struct view *ignored_view)
void
edges_find_neighbors(struct border *nearest_edges, struct view *view,
struct wlr_box target, struct output *output,
edge_validator_t validator, bool use_pending, bool ignore_hidden)
struct wlr_box origin, struct wlr_box target,
struct output *output, edge_validator_t validator, bool ignore_hidden)
{
assert(view);
assert(validator);
@ -391,10 +391,7 @@ edges_find_neighbors(struct border *nearest_edges, struct view *view,
struct border view_edges = { 0 };
struct border target_edges = { 0 };
struct wlr_box *view_geom =
use_pending ? &view->pending : &view->current;
edges_for_target_geometry(&view_edges, view, *view_geom);
edges_for_target_geometry(&view_edges, view, origin);
edges_for_target_geometry(&target_edges, view, target);
struct view *v;
@ -437,8 +434,8 @@ edges_find_neighbors(struct border *nearest_edges, struct view *view,
void
edges_find_outputs(struct border *nearest_edges, struct view *view,
struct wlr_box target, struct output *output,
edge_validator_t validator, bool use_pending)
struct wlr_box origin, struct wlr_box target,
struct output *output, edge_validator_t validator)
{
assert(view);
assert(validator);
@ -453,10 +450,7 @@ edges_find_outputs(struct border *nearest_edges, struct view *view,
struct border view_edges = { 0 };
struct border target_edges = { 0 };
struct wlr_box *view_geom =
use_pending ? &view->pending : &view->current;
edges_for_target_geometry(&view_edges, view, *view_geom);
edges_for_target_geometry(&view_edges, view, origin);
edges_for_target_geometry(&target_edges, view, target);
struct output *o;
@ -473,7 +467,7 @@ edges_find_outputs(struct border *nearest_edges, struct view *view,
output_usable_area_in_layout_coords(o);
struct wlr_box ol;
if (!wlr_box_intersection(&ol, view_geom, &usable) &&
if (!wlr_box_intersection(&ol, &origin, &usable) &&
!wlr_box_intersection(&ol, &target, &usable)) {
continue;
}