parse pango markup in workspace names (and bugfix)

This change allows using numeric character references in workspace names
- for example æ which stands for sharp s. A fix was necessary in
get_pango_layout, since markup and parsed markup had different width.
This commit is contained in:
D.B 2016-10-07 11:27:06 +02:00
parent fa119661e9
commit 6f2c39610e
2 changed files with 6 additions and 4 deletions

View file

@ -205,7 +205,7 @@ void workspace_button_size(struct window *window, const char *workspace_name, in
const char *stripped_name = strip_workspace_name(swaybar.config->strip_workspace_numbers, workspace_name);
get_text_size(window->cairo, window->font, width, height,
window->scale, false, "%s", stripped_name);
window->scale, true, "%s", stripped_name);
*width += 2 * ws_horizontal_padding;
*height += 2 * ws_vertical_padding;
}
@ -241,7 +241,7 @@ static void render_workspace_button(struct window *window, struct config *config
cairo_set_source_u32(window->cairo, box_colors.text);
cairo_move_to(window->cairo, (int)*x + ws_horizontal_padding, margin);
pango_printf(window->cairo, window->font, window->scale,
false, "%s", stripped_name);
true, "%s", stripped_name);
*x += width + ws_spacing;
}