aboutsummaryrefslogtreecommitdiffstats
path: root/swaybar/render.c
diff options
context:
space:
mode:
authorLibravatar Brian Ashworth <bosrsf04@gmail.com>2019-01-10 23:43:45 -0500
committerLibravatar Brian Ashworth <bosrsf04@gmail.com>2019-01-11 00:07:58 -0500
commitc0f92cb2fb94ac87396da99646f9219e54b36860 (patch)
treeb03bd387cc1226031230ad5503dcbf7025128e02 /swaybar/render.c
parentswaylock: Add caps lock state to indicator (diff)
downloadsway-c0f92cb2fb94ac87396da99646f9219e54b36860.tar.gz
sway-c0f92cb2fb94ac87396da99646f9219e54b36860.tar.zst
sway-c0f92cb2fb94ac87396da99646f9219e54b36860.zip
swaybar: add status_padding command
Adds the bar subcommand `status_padding <padding>` which allows setting the padding used for swaybar. If `status_padding` is set to `0`, blocks will be able to take up the full height of the bar.
Diffstat (limited to 'swaybar/render.c')
-rw-r--r--swaybar/render.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/swaybar/render.c b/swaybar/render.c
index 7cbcea07..edc97e77 100644
--- a/swaybar/render.c
+++ b/swaybar/render.c
@@ -35,7 +35,8 @@ static uint32_t render_status_line_error(cairo_t *cairo,
35 cairo_set_source_u32(cairo, 0xFF0000FF); 35 cairo_set_source_u32(cairo, 0xFF0000FF);
36 36
37 int margin = 3 * output->scale; 37 int margin = 3 * output->scale;
38 int ws_vertical_padding = WS_VERTICAL_PADDING * output->scale; 38 double ws_vertical_padding =
39 output->bar->config->status_padding * output->scale;
39 40
40 char *font = output->bar->config->font; 41 char *font = output->bar->config->font;
41 int text_width, text_height; 42 int text_width, text_height;
@@ -71,7 +72,7 @@ static uint32_t render_status_line_text(cairo_t *cairo,
71 get_text_size(cairo, config->font, &text_width, &text_height, NULL, 72 get_text_size(cairo, config->font, &text_width, &text_height, NULL,
72 output->scale, config->pango_markup, "%s", text); 73 output->scale, config->pango_markup, "%s", text);
73 74
74 int ws_vertical_padding = WS_VERTICAL_PADDING * output->scale; 75 double ws_vertical_padding = config->status_padding * output->scale;
75 int margin = 3 * output->scale; 76 int margin = 3 * output->scale;
76 77
77 uint32_t ideal_height = text_height + ws_vertical_padding * 2; 78 uint32_t ideal_height = text_height + ws_vertical_padding * 2;
@@ -153,7 +154,7 @@ static uint32_t render_status_block(cairo_t *cairo,
153 output->scale, block->markup, "%s", block->full_text); 154 output->scale, block->markup, "%s", block->full_text);
154 155
155 int margin = 3 * output->scale; 156 int margin = 3 * output->scale;
156 double ws_vertical_padding = WS_VERTICAL_PADDING * 2 * output->scale; 157 double ws_vertical_padding = config->status_padding * output->scale;
157 158
158 int width = text_width; 159 int width = text_width;
159 if (width < block->min_width) { 160 if (width < block->min_width) {
@@ -212,8 +213,8 @@ static uint32_t render_status_block(cairo_t *cairo,
212 } 213 }
213 214
214 double x_pos = *x; 215 double x_pos = *x;
215 double y_pos = WS_VERTICAL_PADDING * output->scale; 216 double y_pos = ws_vertical_padding;
216 double render_height = height - ws_vertical_padding + output->scale; 217 double render_height = height - ws_vertical_padding * 2;
217 218
218 uint32_t bg_color = block->urgent 219 uint32_t bg_color = block->urgent
219 ? config->colors.urgent_workspace.background : block->background; 220 ? config->colors.urgent_workspace.background : block->background;