diff options
Diffstat (limited to 'swaybar')
| -rw-r--r-- | swaybar/config.c | 1 | ||||
| -rw-r--r-- | swaybar/ipc.c | 7 | ||||
| -rw-r--r-- | swaybar/render.c | 6 |
3 files changed, 10 insertions, 4 deletions
diff --git a/swaybar/config.c b/swaybar/config.c index 86a76a7f..d4cc9b1a 100644 --- a/swaybar/config.c +++ b/swaybar/config.c @@ -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; diff --git a/swaybar/ipc.c b/swaybar/ipc.c index 77e1b94e..bc5c28b4 100644 --- a/swaybar/ipc.c +++ b/swaybar/ipc.c @@ -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) { diff --git a/swaybar/render.c b/swaybar/render.c index edc97e77..993c8228 100644 --- a/swaybar/render.c +++ b/swaybar/render.c @@ -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); |