summaryrefslogtreecommitdiffstats
path: root/swaybar
diff options
context:
space:
mode:
authorLibravatar D.B <thejan.2009@gmail.com>2016-10-07 11:27:06 +0200
committerLibravatar D.B <thejan.2009@gmail.com>2016-10-07 11:27:06 +0200
commit6f2c39610e951b76ff3cc2796c7bd7d3df2d7ba7 (patch)
tree7fa83cd7b67b7ae3cece083580ac2d6035ae4acd /swaybar
parentMerge pull request #934 from alkino/fix_click_title_bar (diff)
downloadsway-6f2c39610e951b76ff3cc2796c7bd7d3df2d7ba7.tar.gz
sway-6f2c39610e951b76ff3cc2796c7bd7d3df2d7ba7.tar.zst
sway-6f2c39610e951b76ff3cc2796c7bd7d3df2d7ba7.zip
parse pango markup in workspace names (and bugfix)
This change allows using numeric character references in workspace names - for example &#230; which stands for sharp s. A fix was necessary in get_pango_layout, since markup and parsed markup had different width.
Diffstat (limited to 'swaybar')
-rw-r--r--swaybar/render.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/swaybar/render.c b/swaybar/render.c
index a773df7b..7dfac891 100644
--- a/swaybar/render.c
+++ b/swaybar/render.c
@@ -205,7 +205,7 @@ void workspace_button_size(struct window *window, const char *workspace_name, in
205 const char *stripped_name = strip_workspace_name(swaybar.config->strip_workspace_numbers, workspace_name); 205 const char *stripped_name = strip_workspace_name(swaybar.config->strip_workspace_numbers, workspace_name);
206 206
207 get_text_size(window->cairo, window->font, width, height, 207 get_text_size(window->cairo, window->font, width, height,
208 window->scale, false, "%s", stripped_name); 208 window->scale, true, "%s", stripped_name);
209 *width += 2 * ws_horizontal_padding; 209 *width += 2 * ws_horizontal_padding;
210 *height += 2 * ws_vertical_padding; 210 *height += 2 * ws_vertical_padding;
211} 211}
@@ -241,7 +241,7 @@ static void render_workspace_button(struct window *window, struct config *config
241 cairo_set_source_u32(window->cairo, box_colors.text); 241 cairo_set_source_u32(window->cairo, box_colors.text);
242 cairo_move_to(window->cairo, (int)*x + ws_horizontal_padding, margin); 242 cairo_move_to(window->cairo, (int)*x + ws_horizontal_padding, margin);
243 pango_printf(window->cairo, window->font, window->scale, 243 pango_printf(window->cairo, window->font, window->scale,
244 false, "%s", stripped_name); 244 true, "%s", stripped_name);
245 245
246 *x += width + ws_spacing; 246 *x += width + ws_spacing;
247} 247}