From 11cfbca7c7cdc204a582e7b86613c228429d24b3 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 22 Jan 2024 22:49:03 -0500 Subject: [PATCH] resistance: properly handled shaded windows --- src/resistance.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/resistance.c b/src/resistance.c index acb1dfe4..d187c44a 100644 --- a/src/resistance.c +++ b/src/resistance.c @@ -54,7 +54,8 @@ build_view_edges(struct view *view, struct wlr_box new_geom, target_edges->left = new_geom.x - border.left; target_edges->top = new_geom.y - border.top; target_edges->right = new_geom.x + new_geom.width + border.right; - target_edges->bottom = new_geom.y + new_geom.height + border.bottom; + target_edges->bottom = new_geom.y + border.bottom + + (view->shaded ? 0 : new_geom.height); } static void @@ -111,7 +112,8 @@ find_neighbor_edges(struct view *view, struct wlr_box new_geom, * *top* edge of v that would be encountered, and vice versa. */ struct border win_edges = { - .top = v->current.y + v->current.height + border.bottom, + .top = v->current.y + border.bottom + + view_effective_height(v, /* use_pending */ false), .right = v->current.x - border.left, .bottom = v->current.y - border.top, .left = v->current.x + v->current.width + border.right,