nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

When in stacking mode with only one child, respect border styles 1pixel and none (Thanks Merovius)

This commit is contained in:
Michael Stapelberg 2011-01-17 14:38:16 +01:00
parent ae4331113e
commit 0eb5eb34cd
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/con.c
View File

@ -625,10 +625,10 @@ int con_border_style(Con *con) {
}
if (con->parent->layout == L_STACKED)
return BS_NORMAL;
return (con_num_children(con->parent) == 1 ? con->border_style : BS_NORMAL);
if (con->parent->layout == L_TABBED && con->border_style != BS_NORMAL)
return con_num_children(con->parent) == 1 ? con->border_style : BS_NORMAL;
return (con_num_children(con->parent) == 1 ? con->border_style : BS_NORMAL);
return con->border_style;
}

8
src/render.c
View File

@ -168,13 +168,15 @@ void render_con(Con *con, bool render_fullscreen) {
child->rect.width = rect.width;
child->rect.height = rect.height;
child->rect.y += (deco_height * children);
child->rect.height -= (deco_height * children);
child->deco_rect.x = x - con->rect.x;
child->deco_rect.y = y - con->rect.y + (i * deco_height);
child->deco_rect.width = child->rect.width;
child->deco_rect.height = deco_height;
if (children > 1 || (child->border_style != BS_1PIXEL && child->border_style != BS_NONE)) {
child->rect.y += (deco_height * children);
child->rect.height -= (deco_height * children);
}
}
/* tabbed layout */