diff options
Diffstat (limited to 'swaybar/render.c')
-rw-r--r-- | swaybar/render.c | 10 |
1 files changed, 5 insertions, 5 deletions
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 | |||
50 | 50 | ||
51 | static void render_block(struct window *window, struct config *config, struct status_block *block, double *x, bool edge) { | 51 | static void render_block(struct window *window, struct config *config, struct status_block *block, double *x, bool edge) { |
52 | int width, height, sep_width; | 52 | int width, height, sep_width; |
53 | get_text_size(window->cairo, window->font, &width, &height, "%s", block->full_text); | 53 | get_text_size(window->cairo, window->font, &width, &height, block->markup, "%s", block->full_text); |
54 | 54 | ||
55 | int textwidth = width; | 55 | int textwidth = width; |
56 | double block_width = width; | 56 | double block_width = width; |
@@ -74,7 +74,7 @@ static void render_block(struct window *window, struct config *config, struct st | |||
74 | // Add separator | 74 | // Add separator |
75 | if (!edge) { | 75 | if (!edge) { |
76 | if (config->sep_symbol) { | 76 | if (config->sep_symbol) { |
77 | get_text_size(window->cairo, window->font, &sep_width, &height, "%s", config->sep_symbol); | 77 | get_text_size(window->cairo, window->font, &sep_width, &height, false, "%s", config->sep_symbol); |
78 | if (sep_width > block->separator_block_width) { | 78 | if (sep_width > block->separator_block_width) { |
79 | block->separator_block_width = sep_width + margin * 2; | 79 | block->separator_block_width = sep_width + margin * 2; |
80 | } | 80 | } |
@@ -201,7 +201,7 @@ static void render_workspace_button(struct window *window, struct config *config | |||
201 | char *name = handle_workspace_number(config->strip_workspace_numbers, ws->name); | 201 | char *name = handle_workspace_number(config->strip_workspace_numbers, ws->name); |
202 | 202 | ||
203 | int width, height; | 203 | int width, height; |
204 | get_text_size(window->cairo, window->font, &width, &height, "%s", name); | 204 | get_text_size(window->cairo, window->font, &width, &height, false, "%s", name); |
205 | struct box_colors box_colors; | 205 | struct box_colors box_colors; |
206 | if (ws->urgent) { | 206 | if (ws->urgent) { |
207 | box_colors = config->colors.urgent_workspace; | 207 | box_colors = config->colors.urgent_workspace; |
@@ -237,7 +237,7 @@ static void render_workspace_button(struct window *window, struct config *config | |||
237 | 237 | ||
238 | static void render_binding_mode_indicator(struct window *window, struct config *config, double pos) { | 238 | static void render_binding_mode_indicator(struct window *window, struct config *config, double pos) { |
239 | int width, height; | 239 | int width, height; |
240 | get_text_size(window->cairo, window->font, &width, &height, "%s", config->mode); | 240 | get_text_size(window->cairo, window->font, &width, &height, false, "%s", config->mode); |
241 | 241 | ||
242 | // background | 242 | // background |
243 | cairo_set_source_u32(window->cairo, config->colors.binding_mode.background); | 243 | 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 | |||
278 | int width, height; | 278 | int width, height; |
279 | 279 | ||
280 | if (line->protocol == TEXT) { | 280 | if (line->protocol == TEXT) { |
281 | get_text_size(window->cairo, window->font, &width, &height, "%s", line->text_line); | 281 | get_text_size(window->cairo, window->font, &width, &height, true, "%s", line->text_line); |
282 | cairo_move_to(cairo, window->width - margin - width, margin); | 282 | cairo_move_to(cairo, window->width - margin - width, margin); |
283 | pango_printf(window->cairo, window->font, true, "%s", line->text_line); | 283 | pango_printf(window->cairo, window->font, true, "%s", line->text_line); |
284 | } else if (line->protocol == I3BAR && line->block_line) { | 284 | } else if (line->protocol == I3BAR && line->block_line) { |