Compare commits

..

No commits in common. "austen-develop" and "master" have entirely different histories.

2 changed files with 4 additions and 12 deletions

View File

@ -1411,17 +1411,6 @@ Con *con_descend_direction(Con *con, direction_t direction) {
*
*/
Rect con_border_style_rect(Con *con) {
Con *cur = con;
while (cur->floating < 2 && cur) {
Con *par = cur->parent;
if (con_num_children(par) == 1)
if (par->type == CT_WORKSPACE)
return (Rect){0, 0, 0, 0};
else
cur = par;
else
break;
}
adjacent_t borders_to_hide = ADJ_NONE;
int border_width = con->current_border_width;
DLOG("The border width for con is set to: %d\n", con->current_border_width);

View File

@ -25,7 +25,10 @@ static void render_con_dockarea(Con *con, Con *child, render_params *p);
* Returns the height for the decorations
*/
int render_deco_height(void) {
return config.font.height + 2;
int deco_height = config.font.height + 4;
if (config.font.height & 0x01)
++deco_height;
return deco_height;
}
/*