koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use con_border_style() to fix titles in stacked/tabbed containers (#5274)

Browse Source 
Previously, the code was directly accessing con->border_style, which circumvents
the special-casing for stacked/tabbed containers that forces window titles even
for title-less containers.

Fixes https://github.com/i3/i3/issues/5269
This commit is contained in:
Michael Stapelberg 2022-11-12 12:43:55 +01:00 committed by GitHub
parent be27a2f50d
commit 2b236955bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/con.c
View File

@ -1700,7 +1700,7 @@ static bool has_outer_gaps(gaps_t gaps) {
*/ */
bool con_draw_decoration_into_frame(Con *con) { bool con_draw_decoration_into_frame(Con *con) {
return con_is_leaf(con) && return con_is_leaf(con) &&
con->border_style == BS_NORMAL && con_border_style(con) == BS_NORMAL &&
(con->parent == NULL || (con->parent == NULL ||
(con->parent->layout != L_TABBED && (con->parent->layout != L_TABBED &&
con->parent->layout != L_STACKED)); con->parent->layout != L_STACKED));
@ -1817,14 +1817,19 @@ int con_border_style(Con *con) {
return BS_NONE; return BS_NONE;
} }
if (con->parent->layout == L_STACKED) if (con->parent != NULL) {
return (con_num_children(con->parent) == 1 ? con->border_style : BS_NORMAL); if (con->parent->layout == L_STACKED) {
return (con_num_children(con->parent) == 1 ? con->border_style : BS_NORMAL);
}
if (con->parent->layout == L_TABBED && 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);
}
if (con->parent->type == CT_DOCKAREA) if (con->parent->type == CT_DOCKAREA) {
return BS_NONE; return BS_NONE;
}
}
return con->border_style; return con->border_style;
} }

6
src/x.c
View File

@ -618,8 +618,8 @@ void x_draw_decoration(Con *con) {
goto copy_pixmaps; goto copy_pixmaps;
/* 4: paint the bar */ /* 4: paint the bar */
DLOG("con->deco_rect = (x=%d, y=%d, w=%d, h=%d)\n", DLOG("con->deco_rect = (x=%d, y=%d, w=%d, h=%d) for con->name=%s\n",
con->deco_rect.x, con->deco_rect.y, con->deco_rect.width, con->deco_rect.height); con->deco_rect.x, con->deco_rect.y, con->deco_rect.width, con->deco_rect.height, con->name);
draw_util_rectangle(dest_surface, p->color->background, draw_util_rectangle(dest_surface, p->color->background,
con->deco_rect.x, con->deco_rect.y, con->deco_rect.width, con->deco_rect.height); con->deco_rect.x, con->deco_rect.y, con->deco_rect.width, con->deco_rect.height);
@ -960,7 +960,7 @@ void x_push_node(Con *con) {
/* The pixmap of a borderless leaf container will not be used except /* The pixmap of a borderless leaf container will not be used except
* for the titlebar in a stack or tabs (issue #1013). */ * for the titlebar in a stack or tabs (issue #1013). */
bool is_pixmap_needed = ((con_is_leaf(con) && con->border_style != BS_NONE) || bool is_pixmap_needed = ((con_is_leaf(con) && con_border_style(con) != BS_NONE) ||
con->layout == L_STACKED || con->layout == L_STACKED ||
con->layout == L_TABBED); con->layout == L_TABBED);
DLOG("Con %p (layout %d), is_pixmap_needed = %s, rect.height = %d\n", DLOG("Con %p (layout %d), is_pixmap_needed = %s, rect.height = %d\n",