mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-20 06:47:03 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix hiding lone titlebar

Browse source
This commit is contained in:
Sarunas Valaskevicius 2024-02-28 18:34:22 +00:00
parent 934caafe87
commit f003cea032
1 changed files with 17 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

37
sway/desktop/transaction.c
View file

@ -288,16 +288,12 @@ static void arrange_container(struct sway_container *con,
static void arrange_children(enum sway_container_layout layout, list_t *children, static void arrange_children(enum sway_container_layout layout, list_t *children,
struct sway_container *active, struct wlr_scene_tree *content, struct sway_container *active, struct wlr_scene_tree *content,
int width, int height, int gaps) { int width, int height, int gaps, bool parent_asks_for_title_bars) {
int title_bar_height = container_titlebar_height();
if (layout == L_TABBED) { if (layout == L_TABBED) {
struct sway_container *first = children->length == 1 ? bool show_titlebar = parent_asks_for_title_bars || !config->hide_lone_tab ||
((struct sway_container *)children->items[0]) : NULL; (children->length > 1) || (children->length == 1 && !((struct sway_container *) children->items[0])->view);
if (config->hide_lone_tab && first && first->view && int title_bar_height = show_titlebar ? container_titlebar_height() : 0;
first->current.border != B_NORMAL) {
title_bar_height = 0;
}
double w = (double) width / children->length; double w = (double) width / children->length;
int title_offset = 0; int title_offset = 0;
@ -315,7 +311,7 @@ static void arrange_children(enum sway_container_layout layout, list_t *children
int net_height = height - title_bar_height; int net_height = height - title_bar_height;
if (activated && width > 0 && net_height > 0) { if (activated && width > 0 && net_height > 0) {
arrange_container(child, width, net_height, title_bar_height == 0, 0); arrange_container(child, width, net_height, false, 0);
} else { } else {
disable_container(child); disable_container(child);
} }
@ -323,12 +319,9 @@ static void arrange_children(enum sway_container_layout layout, list_t *children
title_offset = next_title_offset; title_offset = next_title_offset;
} }
} else if (layout == L_STACKED) { } else if (layout == L_STACKED) {
struct sway_container *first = children->length == 1 ? bool show_titlebar = parent_asks_for_title_bars || !config->hide_lone_tab ||
((struct sway_container *)children->items[0]) : NULL; (children->length > 1) || (children->length == 1 && !((struct sway_container *) children->items[0])->view);
if (config->hide_lone_tab && first && first->view && int title_bar_height = show_titlebar ? container_titlebar_height() : 0;
first->current.border != B_NORMAL) {
title_bar_height = 0;
}
int title_height = title_bar_height * children->length; int title_height = title_bar_height * children->length;
@ -345,7 +338,7 @@ static void arrange_children(enum sway_container_layout layout, list_t *children
int net_height = height - title_height; int net_height = height - title_height;
if (activated && width > 0 && net_height > 0) { if (activated && width > 0 && net_height > 0) {
arrange_container(child, width, net_height, title_bar_height == 0, 0); arrange_container(child, width, net_height, false, 0);
} else { } else {
disable_container(child); disable_container(child);
} }
@ -353,6 +346,8 @@ static void arrange_children(enum sway_container_layout layout, list_t *children
y += title_bar_height; y += title_bar_height;
} }
} else if (layout == L_VERT) { } else if (layout == L_VERT) {
bool show_titlebar = parent_asks_for_title_bars || !config->hide_lone_tab ||
(children->length > 1);
int off = 0; int off = 0;
for (int i = 0; i < children->length; i++) { for (int i = 0; i < children->length; i++) {
struct sway_container *child = children->items[i]; struct sway_container *child = children->items[i];
@ -362,13 +357,15 @@ static void arrange_children(enum sway_container_layout layout, list_t *children
wlr_scene_node_set_position(&child->scene_tree->node, 0, off); wlr_scene_node_set_position(&child->scene_tree->node, 0, off);
wlr_scene_node_reparent(&child->scene_tree->node, content); wlr_scene_node_reparent(&child->scene_tree->node, content);
if (width > 0 && cheight > 0) { if (width > 0 && cheight > 0) {
arrange_container(child, width, cheight, true, gaps); arrange_container(child, width, cheight, show_titlebar, gaps);
off += cheight + gaps; off += cheight + gaps;
} else { } else {
disable_container(child); disable_container(child);
} }
} }
} else if (layout == L_HORIZ) { } else if (layout == L_HORIZ) {
bool show_titlebar = parent_asks_for_title_bars || !config->hide_lone_tab ||
(children->length > 1);
int off = 0; int off = 0;
for (int i = 0; i < children->length; i++) { for (int i = 0; i < children->length; i++) {
struct sway_container *child = children->items[i]; struct sway_container *child = children->items[i];
@ -378,7 +375,7 @@ static void arrange_children(enum sway_container_layout layout, list_t *children
wlr_scene_node_set_position(&child->scene_tree->node, off, 0); wlr_scene_node_set_position(&child->scene_tree->node, off, 0);
wlr_scene_node_reparent(&child->scene_tree->node, content); wlr_scene_node_reparent(&child->scene_tree->node, content);
if (cwidth > 0 && height > 0) { if (cwidth > 0 && height > 0) {
arrange_container(child, cwidth, height, true, gaps); arrange_container(child, cwidth, height, show_titlebar, gaps);
off += cwidth + gaps; off += cwidth + gaps;
} else { } else {
disable_container(child); disable_container(child);
@ -464,7 +461,7 @@ static void arrange_container(struct sway_container *con,
arrange_children(con->current.layout, con->current.children, arrange_children(con->current.layout, con->current.children,
con->current.focused_inactive_child, con->content_tree, con->current.focused_inactive_child, con->content_tree,
width, height, gaps); width, height, gaps, title_bar);
} }
} }
@ -545,7 +542,7 @@ static void arrange_workspace_tiling(struct sway_workspace *ws,
int width, int height) { int width, int height) {
arrange_children(ws->current.layout, ws->current.tiling, arrange_children(ws->current.layout, ws->current.tiling,
ws->current.focused_inactive_child, ws->layers.tiling, ws->current.focused_inactive_child, ws->layers.tiling,
width, height, ws->gaps_inner); width, height, ws->gaps_inner, false);
} }
static void disable_workspace(struct sway_workspace *ws) { static void disable_workspace(struct sway_workspace *ws) {