From a25c35f859e64dd3007c1a86eae48ac449ab7dbd Mon Sep 17 00:00:00 2001 From: Mykyta Holubakha Date: Sun, 24 Apr 2016 10:39:42 +0300 Subject: [PATCH] Passing missing argument to get_text_size --- sway/border.c | 2 +- swaybar/render.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sway/border.c b/sway/border.c index 3613d2d6..a6ed4238 100644 --- a/sway/border.c +++ b/sway/border.c @@ -157,7 +157,7 @@ static void render_with_title_bar(swayc_t *view, cairo_t *cr, struct border_colo // text if (view->name) { int width, height; - get_text_size(cr, config->font, &width, &height, "%s", view->name); + get_text_size(cr, config->font, &width, &height, false, "%s", view->name); int x = MIN(view->actual_geometry.origin.x, view->border_thickness); int y = MIN(view->actual_geometry.origin.y - height - 2, 2); cairo_move_to(cr, x, y); diff --git a/swaybar/render.c b/swaybar/render.c index 3eb824fe..5901b557 100644 --- a/swaybar/render.c +++ b/swaybar/render.c @@ -50,7 +50,7 @@ static void render_sharp_line(cairo_t *cairo, uint32_t color, double x, double y static void render_block(struct window *window, struct config *config, struct status_block *block, double *x, bool edge) { int width, height, sep_width; - get_text_size(window->cairo, window->font, &width, &height, "%s", block->full_text); + get_text_size(window->cairo, window->font, &width, &height, block->markup, "%s", block->full_text); int textwidth = width; double block_width = width; @@ -74,7 +74,7 @@ static void render_block(struct window *window, struct config *config, struct st // Add separator if (!edge) { if (config->sep_symbol) { - get_text_size(window->cairo, window->font, &sep_width, &height, "%s", config->sep_symbol); + get_text_size(window->cairo, window->font, &sep_width, &height, false, "%s", config->sep_symbol); if (sep_width > block->separator_block_width) { block->separator_block_width = sep_width + margin * 2; } @@ -201,7 +201,7 @@ static void render_workspace_button(struct window *window, struct config *config char *name = handle_workspace_number(config->strip_workspace_numbers, ws->name); int width, height; - get_text_size(window->cairo, window->font, &width, &height, "%s", name); + get_text_size(window->cairo, window->font, &width, &height, false, "%s", name); struct box_colors box_colors; if (ws->urgent) { box_colors = config->colors.urgent_workspace; @@ -237,7 +237,7 @@ static void render_workspace_button(struct window *window, struct config *config static void render_binding_mode_indicator(struct window *window, struct config *config, double pos) { int width, height; - get_text_size(window->cairo, window->font, &width, &height, "%s", config->mode); + get_text_size(window->cairo, window->font, &width, &height, false, "%s", config->mode); // background cairo_set_source_u32(window->cairo, config->colors.binding_mode.background); @@ -278,7 +278,7 @@ void render(struct output *output, struct config *config, struct status_line *li int width, height; if (line->protocol == TEXT) { - get_text_size(window->cairo, window->font, &width, &height, "%s", line->text_line); + get_text_size(window->cairo, window->font, &width, &height, true, "%s", line->text_line); cairo_move_to(cairo, window->width - margin - width, margin); pango_printf(window->cairo, window->font, true, "%s", line->text_line); } else if (line->protocol == I3BAR && line->block_line) {