mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-10-29 05:40:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

swaybar: add status_edge_padding command

Browse source 
This adds the bar subcommand `status_edge_padding <padding>` to set the
padding used when the status line is on the right edge of the bar.
This commit is contained in:
Brian Ashworth 2019-01-11 00:12:24 -05:00
parent c0f92cb2fb
commit ca0a75d540
12 changed files with 44 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
swaybar/config.c
View file

@ -38,6 +38,7 @@ struct swaybar_config *init_config(void) {
config->bindings = create_list();
wl_list_init(&config->outputs);
config->status_padding = 1;
config->status_edge_padding = 3;
/* height */
config->height = 0;

7
swaybar/ipc.c
View file

@ -157,7 +157,7 @@ static bool ipc_parse_config(
json_object *font, *gaps, *bar_height, *wrap_scroll, *workspace_buttons;
json_object *strip_workspace_numbers, *strip_workspace_name;
json_object *binding_mode_indicator, *verbose, *colors, *sep_symbol;
json_object *outputs, *bindings, *status_padding;
json_object *outputs, *bindings, *status_padding, *status_edge_padding;
json_object_object_get_ex(bar_config, "mode", &mode);
json_object_object_get_ex(bar_config, "hidden_state", &hidden_state);
json_object_object_get_ex(bar_config, "position", &position);
@ -177,6 +177,8 @@ static bool ipc_parse_config(
json_object_object_get_ex(bar_config, "pango_markup", &markup);
json_object_object_get_ex(bar_config, "bindings", &bindings);
json_object_object_get_ex(bar_config, "status_padding", &status_padding);
json_object_object_get_ex(bar_config, "status_edge_padding",
&status_edge_padding);
if (status_command) {
free(config->status_command);
config->status_command = strdup(json_object_get_string(status_command));
@ -213,6 +215,9 @@ static bool ipc_parse_config(
if (status_padding) {
config->status_padding = json_object_get_int(status_padding);
}
if (status_edge_padding) {
config->status_edge_padding = json_object_get_int(status_edge_padding);
}
if (gaps) {
json_object *top = json_object_object_get(gaps, "top");
if (top) {

6
swaybar/render.c
View file

@ -194,8 +194,8 @@ static uint32_t render_status_block(cairo_t *cairo,
}
}
*x -= sep_block_width;
} else {
*x -= margin;
} else if (config->status_edge_padding) {
*x -= config->status_edge_padding * output->scale;
}
uint32_t height = output->height * output->scale;
@ -287,7 +287,7 @@ static uint32_t render_status_block(cairo_t *cairo,
static uint32_t render_status_line_i3bar(cairo_t *cairo,
struct swaybar_output *output, double *x) {
uint32_t max_height = 0;
bool edge = true;
bool edge = *x == output->width * output->scale;
struct i3bar_block *block;
wl_list_for_each(block, &output->bar->status->blocks, link) {
uint32_t h = render_status_block(cairo, output, block, x, edge);