From 8d0048c8d5b3774f79fcb0711d63bcc226b78631 Mon Sep 17 00:00:00 2001
From: "D.B" <thejan.2009@gmail.com>
Date: Sat, 30 Jul 2016 15:12:34 +0200
Subject: properly hide top border inside tabbed/stacked
When titlebar is hidden, top border of the topmost view inside
tabbed/stacked container will not be drawn. This is changed in layout.c
On the other hand, top border should be drawn sometimes, for example
when titlebar is hidden on a view that is not the topmost inside
tabbed/stacked container. This is changed in border.c
---
sway/border.c | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
(limited to 'sway/border.c')
diff --git a/sway/border.c b/sway/border.c
index d17d8d0c..c1a62bc6 100644
--- a/sway/border.c
+++ b/sway/border.c
@@ -332,10 +332,12 @@ void update_view_border(swayc_t *view) {
}
};
cr = create_border_buffer(view, g, &surface);
+
+ bool render_top = !should_hide_top_border(view, view->y);
if (view == focused) {
- render_borders(view, cr, &config->border_colors.focused, false);
+ render_borders(view, cr, &config->border_colors.focused, render_top);
} else {
- render_borders(view, cr, &config->border_colors.focused_inactive, false);
+ render_borders(view, cr, &config->border_colors.focused_inactive, render_top);
}
// generate container titles
@@ -418,3 +420,17 @@ void render_view_borders(wlc_handle view) {
wlc_pixels_write(WLC_RGBA8888, &c->border->geometry, c->border->buffer);
}
}
+
+bool should_hide_top_border(swayc_t *con, double y) {
+ // returns true if container is child of tabbed/stacked layout and is
+ // sharing top border with tabbed titlebar
+ swayc_t *par = con->parent;
+ while (par->type != C_WORKSPACE) {
+ if (par->layout == L_TABBED || par->layout == L_STACKED) {
+ return con->y == y;
+ }
+ con = par;
+ par = par->parent;
+ }
+ return false;
+}
--
cgit v1.2.3