diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-07-06 06:28:01 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-06 06:28:01 -0700 |
commit | 3d2595b1028ce1f7cf0ceff673e7180c6c991afb (patch) | |
tree | a645930a9b105185a5f2dbddbe8ca8acf50a4559 /swaybar | |
parent | Attach destroy handler earlier (diff) | |
parent | Merge pull request #2217 from RedSoxFan/fix-663 (diff) | |
download | sway-3d2595b1028ce1f7cf0ceff673e7180c6c991afb.tar.gz sway-3d2595b1028ce1f7cf0ceff673e7180c6c991afb.tar.zst sway-3d2595b1028ce1f7cf0ceff673e7180c6c991afb.zip |
Merge branch 'master' into remove-input-fix
Diffstat (limited to 'swaybar')
-rw-r--r-- | swaybar/render.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/swaybar/render.c b/swaybar/render.c index 327a6f5f..efd3fdeb 100644 --- a/swaybar/render.c +++ b/swaybar/render.c | |||
@@ -298,7 +298,8 @@ static uint32_t render_binding_mode_indicator(cairo_t *cairo, | |||
298 | 298 | ||
299 | int text_width, text_height; | 299 | int text_width, text_height; |
300 | get_text_size(cairo, config->font, &text_width, &text_height, | 300 | get_text_size(cairo, config->font, &text_width, &text_height, |
301 | output->scale, config->pango_markup, "%s", mode); | 301 | output->scale, config->mode_pango_markup, |
302 | "%s", mode); | ||
302 | 303 | ||
303 | int ws_vertical_padding = WS_VERTICAL_PADDING * output->scale; | 304 | int ws_vertical_padding = WS_VERTICAL_PADDING * output->scale; |
304 | int ws_horizontal_padding = WS_HORIZONTAL_PADDING * output->scale; | 305 | int ws_horizontal_padding = WS_HORIZONTAL_PADDING * output->scale; |
@@ -329,7 +330,7 @@ static uint32_t render_binding_mode_indicator(cairo_t *cairo, | |||
329 | double text_y = height / 2.0 - text_height / 2.0; | 330 | double text_y = height / 2.0 - text_height / 2.0; |
330 | cairo_set_source_u32(cairo, config->colors.binding_mode.text); | 331 | cairo_set_source_u32(cairo, config->colors.binding_mode.text); |
331 | cairo_move_to(cairo, x + width / 2 - text_width / 2, (int)floor(text_y)); | 332 | cairo_move_to(cairo, x + width / 2 - text_width / 2, (int)floor(text_y)); |
332 | pango_printf(cairo, config->font, output->scale, config->pango_markup, | 333 | pango_printf(cairo, config->font, output->scale, config->mode_pango_markup, |
333 | "%s", mode); | 334 | "%s", mode); |
334 | return surface_height; | 335 | return surface_height; |
335 | } | 336 | } |