add --smart-titles flag to hide_edge_borders

to hide the title bar on workspaces with one child, fix #7409
This commit is contained in:
Guilhem Saurel 2023-12-29 13:12:56 +01:00 committed by Sarunas Valaskevicius
parent 23389ebd1f
commit 72d32e2ddf
5 changed files with 21 additions and 5 deletions

View File

@ -556,6 +556,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 {

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();

View File

@ -306,6 +306,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;

View File

@ -741,10 +741,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.

View File

@ -356,8 +356,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;