mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-05-26 21:38:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

seatop_move_tiling: clamp edge thresholds to parent box

Browse source 
When a fullscreen view is present on a workspace that has panels (e.g. a
bar with exclusive zone), the view's content geometry extends beyond the
workspace's usable area. The edge-detection thresholds computed from the
view's content_x/content_width could then lie outside the parent
container's box, causing the indicator width or height to become
negative. This triggered an assertion in wlr_scene_rect_set_size.  Fix
this by clamping the threshold coordinates to the parent container's
boundaries before using them to size the drop indicator.

fixes #9102
This commit is contained in:
Furkan Sahin 2026-04-27 00:16:26 -04:00 • committed by Simon Ser
parent abb959602f
commit 3774506bd0
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sway/input/seatop_move_tiling.c
View file

@ -234,18 +234,22 @@ static void handle_motion_postthreshold(struct sway_seat *seat) {
if (layout == L_HORIZ || layout == L_TABBED) { if (layout == L_HORIZ || layout == L_TABBED) {
if (cursor->cursor->y < thresh_top) { if (cursor->cursor->y < thresh_top) {
edge = WLR_EDGE_TOP; edge = WLR_EDGE_TOP;
if (thresh_top < box.y) thresh_top = box.y;
box.height = thresh_top - box.y; box.height = thresh_top - box.y;
} else if (cursor->cursor->y > thresh_bottom) { } else if (cursor->cursor->y > thresh_bottom) {
edge = WLR_EDGE_BOTTOM; edge = WLR_EDGE_BOTTOM;
if (thresh_bottom > box.y + box.height) thresh_bottom = box.y + box.height;
box.height = box.y + box.height - thresh_bottom; box.height = box.y + box.height - thresh_bottom;
box.y = thresh_bottom; box.y = thresh_bottom;
} }
} else if (layout == L_VERT || layout == L_STACKED) { } else if (layout == L_VERT || layout == L_STACKED) {
if (cursor->cursor->x < thresh_left) { if (cursor->cursor->x < thresh_left) {
edge = WLR_EDGE_LEFT; edge = WLR_EDGE_LEFT;
if (thresh_left < box.x) thresh_left = box.x;
box.width = thresh_left - box.x; box.width = thresh_left - box.x;
} else if (cursor->cursor->x > thresh_right) { } else if (cursor->cursor->x > thresh_right) {
edge = WLR_EDGE_RIGHT; edge = WLR_EDGE_RIGHT;
if (thresh_right > box.x + box.width) thresh_right = box.x + box.width;
box.width = box.x + box.width - thresh_right; box.width = box.x + box.width - thresh_right;
box.x = thresh_right; box.x = thresh_right;
} }