aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2016-10-08 09:45:06 -0400
committerLibravatar Drew DeVault <sir@cmpwn.com>2016-10-12 21:43:16 -0400
commit68fb10a84b09df81d1e2630b19af2ac151d9c203 (patch)
tree334755760fdaa9e9dfee8f0663d4ad7cfbd7a3e2
parentMerge pull request #940 from thejan2009/reorder-cmd-handler (diff)
downloadsway-68fb10a84b09df81d1e2630b19af2ac151d9c203.tar.gz
sway-68fb10a84b09df81d1e2630b19af2ac151d9c203.tar.zst
sway-68fb10a84b09df81d1e2630b19af2ac151d9c203.zip
Merge pull request #941 from thejan2009/floating-border
Fix border color for floating containers
-rw-r--r--sway/border.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/border.c b/sway/border.c
index ea29617f..db1a3836 100644
--- a/sway/border.c
+++ b/sway/border.c
@@ -124,7 +124,7 @@ static void render_borders(swayc_t *view, cairo_t *cr, struct border_colors *col
124 // right border 124 // right border
125 int right_border = b->size.w - v->size.w - left_border; 125 int right_border = b->size.w - v->size.w - left_border;
126 if (right_border > 0) { 126 if (right_border > 0) {
127 if (is_only_child && layout == L_HORIZ) { 127 if (is_only_child && layout == L_HORIZ && !view->is_floating) {
128 color = colors->indicator; 128 color = colors->indicator;
129 } else { 129 } else {
130 color = colors->child_border; 130 color = colors->child_border;
@@ -150,7 +150,7 @@ static void render_borders(swayc_t *view, cairo_t *cr, struct border_colors *col
150 // bottom border 150 // bottom border
151 int bottom_border = b->size.h - (top_border + v->size.h); 151 int bottom_border = b->size.h - (top_border + v->size.h);
152 if (bottom_border > 0) { 152 if (bottom_border > 0) {
153 if (is_only_child && layout == L_VERT) { 153 if (is_only_child && layout == L_VERT && !view->is_floating) {
154 color = colors->indicator; 154 color = colors->indicator;
155 } else { 155 } else {
156 color = colors->child_border; 156 color = colors->child_border;