alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #889 from thejan2009/bugfix/indicator_border

Browse source 
Use indicator border color only when needed.
This commit is contained in:
Drew DeVault 2016-09-10 10:17:16 -04:00 committed by GitHub
parent 40013029ea 873dfc07f3
commit 7c166e350b
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sway/border.c
View file

@ -108,6 +108,9 @@ static void render_borders(swayc_t *view, cairo_t *cr, struct border_colors *col
int x = b->origin.x - g->origin.x; int x = b->origin.x - g->origin.x;
int y = b->origin.y - g->origin.y; int y = b->origin.y - g->origin.y;
// draw vertical/horizontal indicator if container is the only child of its parent container
bool is_only_child = view->parent && view->parent->children && view->parent->children->length == 1;
// left border // left border
int left_border = v->origin.x - b->origin.x; int left_border = v->origin.x - b->origin.x;
if (left_border > 0) { if (left_border > 0) {
@ -121,7 +124,7 @@ static void render_borders(swayc_t *view, cairo_t *cr, struct border_colors *col
// right border // right border
int right_border = b->size.w - v->size.w - left_border; int right_border = b->size.w - v->size.w - left_border;
if (right_border > 0) { if (right_border > 0) {
if (layout == L_HORIZ) { if (is_only_child && layout == L_HORIZ) {
color = colors->indicator; color = colors->indicator;
} else { } else {
color = colors->child_border; color = colors->child_border;
@ -147,7 +150,7 @@ static void render_borders(swayc_t *view, cairo_t *cr, struct border_colors *col
// bottom border // bottom border
int bottom_border = b->size.h - (top_border + v->size.h); int bottom_border = b->size.h - (top_border + v->size.h);
if (bottom_border > 0) { if (bottom_border > 0) {
if (layout == L_VERT) { if (is_only_child && layout == L_VERT) {
color = colors->indicator; color = colors->indicator;
} else { } else {
color = colors->child_border; color = colors->child_border;