mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-04 13:30:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

workspaces.c: fix bug with RTL locales, closes #1633

Browse source
This commit is contained in:
01micko 2024-03-18 20:58:18 +10:00 • committed by Johan Malm
parent a3144cc5ea
commit 8b8652e2b3
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/workspaces.c
View file

@ -124,22 +124,21 @@ _osd_update(struct server *server)
/* Text */ /* Text */
set_cairo_color(cairo, server->theme->osd_label_text_color); set_cairo_color(cairo, server->theme->osd_label_text_color);
PangoLayout *layout = pango_cairo_create_layout(cairo); PangoLayout *layout = pango_cairo_create_layout(cairo);
pango_layout_set_width(layout, (width - 2 * margin) * PANGO_SCALE);
pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_END); pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_END);
PangoFontDescription *desc = font_to_pango_desc(&rc.font_osd);
pango_layout_set_font_description(layout, desc);
/* Center workspace indicator on the x axis */ /* Center workspace indicator on the x axis */
x = font_width(&rc.font_osd, server->workspace_current->name); int req_width = font_width(&rc.font_osd, server->workspace_current->name);
x = (width - x) / 2; req_width = MIN(req_width, width - 2 * margin);
x = (width - req_width) / 2;
if (!hide_boxes) { if (!hide_boxes) {
cairo_move_to(cairo, x, margin * 2 + rect_height); cairo_move_to(cairo, x, margin * 2 + rect_height);
} else { } else {
cairo_move_to(cairo, x, (height - font_height(&rc.font_osd)) / 2.0); cairo_move_to(cairo, x, (height - font_height(&rc.font_osd)) / 2.0);
} }
PangoFontDescription *desc = font_to_pango_desc(&rc.font_osd);
//pango_font_description_set_weight(desc, PANGO_WEIGHT_BOLD); //pango_font_description_set_weight(desc, PANGO_WEIGHT_BOLD);
pango_layout_set_font_description(layout, desc); pango_layout_set_font_description(layout, desc);
pango_layout_set_width(layout, req_width * PANGO_SCALE);
pango_font_description_free(desc); pango_font_description_free(desc);
pango_layout_set_text(layout, server->workspace_current->name, -1); pango_layout_set_text(layout, server->workspace_current->name, -1);
pango_cairo_show_layout(cairo, layout); pango_cairo_show_layout(cairo, layout);