mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-10-08 13:16:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge 5324d83457 into a7d9535eb3

Browse source
This commit is contained in:
Sarunas Valaskevicius 2025-09-17 10:39:07 -07:00 • committed by GitHub
commit 75b67d8f50
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 38 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/sway/config.h
View file

@ -563,6 +563,7 @@ struct sway_config {
enum edge_border_types hide_edge_borders;
enum edge_border_smart_types hide_edge_borders_smart;
bool hide_lone_tab;
bool hide_lone_title;
// border colors
struct {

9
sway/commands/hide_edge_borders.c
View file

@ -13,7 +13,13 @@ struct cmd_results *cmd_hide_edge_borders(int argc, char **argv) {
}
bool hide_lone_tab = false;
if (strcmp(*argv, "--i3") == 0) {
bool hide_lone_title = false;
if (strcmp(*argv, "--smart-titles") == 0) {
hide_lone_tab = true;
hide_lone_title = true;
++argv;
--argc;
} else if (strcmp(*argv, "--i3") == 0) {
hide_lone_tab = true;
++argv;
--argc;
@ -41,6 +47,7 @@ struct cmd_results *cmd_hide_edge_borders(int argc, char **argv) {
return cmd_results_new(CMD_INVALID, "%s", expected_syntax);
}
config->hide_lone_tab = hide_lone_tab;
config->hide_lone_title = hide_lone_title;
arrange_root();

1
sway/config.c
View file

@ -307,6 +307,7 @@ static void config_defaults(struct sway_config *config) {
config->hide_edge_borders = E_NONE;
config->hide_edge_borders_smart = ESMART_OFF;
config->hide_lone_tab = false;
config->hide_lone_title = false;
config->has_focused_tab_title = false;

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,
struct sway_container *active, struct wlr_scene_tree *content,
int width, int height, int gaps) {
int title_bar_height = container_titlebar_height();
int width, int height, int gaps, bool parent_asks_for_title_bars) {
if (layout == L_TABBED) {
struct sway_container *first = children->length == 1 ?
((struct sway_container *)children->items[0]) : NULL;
if (config->hide_lone_tab && first && first->view &&
first->current.border != B_NORMAL) {
title_bar_height = 0;
}
bool show_titlebar = parent_asks_for_title_bars || !config->hide_lone_tab ||
(children->length > 1) || (children->length == 1 && !((struct sway_container *) children->items[0])->view);
int title_bar_height = show_titlebar ? container_titlebar_height() : 0;
double w = (double) width / children->length;
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;
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 {
disable_container(child);
}
@ -323,12 +319,9 @@ static void arrange_children(enum sway_container_layout layout, list_t *children
title_offset = next_title_offset;
}
} else if (layout == L_STACKED) {
struct sway_container *first = children->length == 1 ?
((struct sway_container *)children->items[0]) : NULL;
if (config->hide_lone_tab && first && first->view &&
first->current.border != B_NORMAL) {
title_bar_height = 0;
}
bool show_titlebar = parent_asks_for_title_bars || !config->hide_lone_tab ||
(children->length > 1) || (children->length == 1 && !((struct sway_container *) children->items[0])->view);
int title_bar_height = show_titlebar ? container_titlebar_height() : 0;
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;
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 {
disable_container(child);
}
@ -353,6 +346,8 @@ static void arrange_children(enum sway_container_layout layout, list_t *children
y += title_bar_height;
}
} else if (layout == L_VERT) {
bool show_titlebar = parent_asks_for_title_bars || !config->hide_lone_tab ||
(children->length > 1);
int off = 0;
for (int i = 0; i < children->length; 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_reparent(&child->scene_tree->node, content);
if (width > 0 && cheight > 0) {
arrange_container(child, width, cheight, true, gaps);
arrange_container(child, width, cheight, show_titlebar, gaps);
off += cheight + gaps;
} else {
disable_container(child);
}
}
} else if (layout == L_HORIZ) {
bool show_titlebar = parent_asks_for_title_bars || !config->hide_lone_tab ||
(children->length > 1);
int off = 0;
for (int i = 0; i < children->length; 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_reparent(&child->scene_tree->node, content);
if (cwidth > 0 && height > 0) {
arrange_container(child, cwidth, height, true, gaps);
arrange_container(child, cwidth, height, show_titlebar, gaps);
off += cwidth + gaps;
} else {
disable_container(child);
@ -464,7 +461,7 @@ static void arrange_container(struct sway_container *con,
arrange_children(con->current.layout, con->current.children,
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) {
arrange_children(ws->current.layout, ws->current.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) {

5
sway/sway.5.scd
View file

@ -787,10 +787,11 @@ The default colors are:
This affects new workspaces only, and is used when the workspace doesn't
have its own gaps settings (see: workspace <ws> gaps ...).
*hide_edge_borders* [--i3] none|vertical|horizontal|both|smart|smart_no_gaps
*hide_edge_borders* [--i3 | --smart-titles] none|vertical|horizontal|both|smart|smart_no_gaps
Hides window borders adjacent to the screen edges. Default is _none_. The
_--i3_ option enables i3-compatible behavior to hide the title bar on
tabbed and stacked containers with one child. The _smart_|_smart_no_gaps_
tabbed and stacked containers with one child. The --smart-titles option
hide the title bar on workspaces with only one child. The _smart_|_smart_no_gaps_
options are equivalent to setting _smart_borders_ smart|no_gaps and
_hide_edge_borders_ none.

10
sway/tree/view.c
View file

@ -402,8 +402,14 @@ void view_autoconfigure(struct sway_view *view) {
height = con->pending.height - y_offset
- con->pending.border_thickness * con->pending.border_bottom;
} else {
y = con->pending.y + container_titlebar_height();
height = con->pending.height - container_titlebar_height()
int titlebar_height;
if (config->hide_lone_title && view_is_only_visible(view)) {
titlebar_height = con->pending.border_thickness * con->pending.border_top + y_offset;
} else {
titlebar_height = container_titlebar_height();
}
y = con->pending.y + titlebar_height;
height = con->pending.height - titlebar_height
- con->pending.border_thickness * con->pending.border_bottom;
}
break;