Skip to content

Commit

Permalink
add --title flag to hide_edge_borders, fix swaywm#7409
Browse files Browse the repository at this point in the history
Hide the titleb bar on containers with one child
  • Loading branch information
nim65s committed Dec 29, 2023
1 parent 0aceff7 commit 0e37cc3
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 9 deletions.
1 change: 1 addition & 0 deletions include/sway/config.h
Expand Up @@ -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 {
Expand Down
7 changes: 7 additions & 0 deletions sway/commands/hide_edge_borders.c
Expand Up @@ -13,10 +13,16 @@ struct cmd_results *cmd_hide_edge_borders(int argc, char **argv) {
}

bool hide_lone_tab = false;
bool hide_lone_title = false;
if (strcmp(*argv, "--i3") == 0) {
hide_lone_tab = true;
++argv;
--argc;
} else if (strcmp(*argv, "--title") == 0) {
hide_lone_tab = true;
hide_lone_title = true;
++argv;
--argc;
}

if (!argc) {
Expand All @@ -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();

Expand Down
1 change: 1 addition & 0 deletions sway/config.c
Expand Up @@ -298,6 +298,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;

Expand Down
11 changes: 7 additions & 4 deletions sway/desktop/render.c
Expand Up @@ -689,7 +689,8 @@ static void render_container(struct render_context *ctx,
* they'll apply their own borders to their children.
*/
static void render_containers_linear(struct render_context *ctx, struct parent_data *parent) {
for (int i = 0; i < parent->children->length; ++i) {
int children_length = parent->children->length;
for (int i = 0; i < children_length; ++i) {
struct sway_container *child = parent->children->items[i];

if (child->view) {
Expand Down Expand Up @@ -718,9 +719,11 @@ static void render_containers_linear(struct render_context *ctx, struct parent_d
}

if (state->border == B_NORMAL) {
render_titlebar(ctx, child, floor(state->x),
floor(state->y), state->width, colors,
title_texture, marks_texture);
if(!config->hide_lone_title || children_length > 1) {
render_titlebar(ctx, child, floor(state->x),
floor(state->y), state->width, colors,
title_texture, marks_texture);
}
} else if (state->border == B_PIXEL) {
render_top_border(ctx, child, colors);
}
Expand Down
5 changes: 3 additions & 2 deletions sway/sway.5.scd
Expand Up @@ -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 | --title] 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 --title option hide
the title bar on any container with one child. The _smart_|_smart_no_gaps_
options are equivalent to setting _smart_borders_ smart|no_gaps and
_hide_edge_borders_ none.

Expand Down
13 changes: 10 additions & 3 deletions sway/tree/view.c
Expand Up @@ -343,9 +343,16 @@ void view_autoconfigure(struct sway_view *view) {
y = con->pending.y + y_offset;
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()
} else {
list_t *siblings = container_get_siblings(con);
int titlebar_height;
if (config->hide_lone_title && siblings && siblings->length < 2) {
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;
Expand Down

0 comments on commit 0e37cc3

Please sign in to comment.