From d657c9c7a5628a8460828e5440f838e2d19a3dc4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ingo=20B=C3=BCrk?= Date: Sat, 5 Sep 2015 01:44:37 +0200 Subject: [PATCH] Make sure borders are never counted as adjacent to the edge for floating containers. fixes #1215 relates to #998 --- src/con.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/con.c b/src/con.c index b1ddf2ac..9a5d36c1 100644 --- a/src/con.c +++ b/src/con.c @@ -1245,18 +1245,13 @@ Rect con_border_style_rect(Con *con) { int border_style = con_border_style(con); if (border_style == BS_NONE) return (Rect){0, 0, 0, 0}; - borders_to_hide = con_adjacent_borders(con) & config.hide_edge_borders; if (border_style == BS_NORMAL) { result = (Rect){border_width, 0, -(2 * border_width), -(border_width)}; } else { result = (Rect){border_width, border_width, -(2 * border_width), -(2 * border_width)}; } - /* Floating windows are never adjacent to any other window, so - don’t hide their border(s). This prevents bug #998. */ - if (con_is_floating(con)) - return result; - + borders_to_hide = con_adjacent_borders(con) & config.hide_edge_borders; if (borders_to_hide & ADJ_LEFT_SCREEN_EDGE) { result.x -= border_width; result.width += border_width; @@ -1280,6 +1275,11 @@ Rect con_border_style_rect(Con *con) { */ adjacent_t con_adjacent_borders(Con *con) { adjacent_t result = ADJ_NONE; + /* Floating windows are never adjacent to any other window, so + don’t hide their border(s). This prevents bug #998. */ + if (con_is_floating(con)) + return result; + Con *workspace = con_get_workspace(con); if (con->rect.x == workspace->rect.x) result |= ADJ_LEFT_SCREEN_EDGE; -- 2.39.5