mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-26 06:46:26 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Ellipsize titles that are too large in the bar

Browse source 
When titles were very large they would overlap the status line.
Ellipsize the title to get it to fit.
This commit is contained in:
Pedro Côrte-Real 2019-08-17 20:59:07 +01:00
parent 8a019a83c9
commit fc19355327
3 changed files with 38 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

30
common/pango.c
View file

@ -136,3 +136,33 @@ void pango_printf(cairo_t *cairo, const char *font,
g_object_unref(layout);
free(buf);
}
void pango_printf_ellipsized(cairo_t *cairo, const char *font,
double scale, bool markup, int max_width, const char *fmt, ...) {
va_list args;
va_start(args, fmt);
// Add one since vsnprintf excludes null terminator.
int length = vsnprintf(NULL, 0, fmt, args) + 1;
va_end(args);
char *buf = malloc(length);
if (buf == NULL) {
sway_log(SWAY_ERROR, "Failed to allocate memory");
return;
}
va_start(args, fmt);
vsnprintf(buf, length, fmt, args);
va_end(args);
PangoLayout *layout = get_pango_layout(cairo, font, buf, scale, markup);
pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_END);
pango_layout_set_width(layout, pango_units_from_double(max_width));
cairo_font_options_t *fo = cairo_font_options_create();
cairo_get_font_options(cairo, fo);
pango_cairo_context_set_font_options(pango_layout_get_context(layout), fo);
cairo_font_options_destroy(fo);
pango_cairo_update_layout(cairo, layout);
pango_cairo_show_layout(cairo, layout);
g_object_unref(layout);
free(buf);
}

2
include/pango.h
View file

@ -19,5 +19,7 @@ void get_text_size(cairo_t *cairo, const char *font, int *width, int *height,
int *baseline, double scale, bool markup, const char *fmt, ...);
void pango_printf(cairo_t *cairo, const char *font,
double scale, bool markup, const char *fmt, ...);
void pango_printf_ellipsized(cairo_t *cairo, const char *font,
double scale, bool markup, int max_width, const char *fmt, ...);
#endif

14
swaybar/render.c
View file

@ -537,7 +537,7 @@ static uint32_t render_binding_mode_indicator(cairo_t *cairo,
}
static uint32_t render_window_title(cairo_t *cairo,
struct swaybar_output *output, double x) {
struct swaybar_output *output, double x, double max_x) {
const char *title = output->bar->config->title;
if (!title) {
return 0;
@ -561,17 +561,14 @@ static uint32_t render_window_title(cairo_t *cairo,
return ideal_surface_height;
}
uint32_t width = text_width + ws_horizontal_padding * 2 + border_width * 2;
uint32_t max_width = fmin(width, max_x - x);
uint32_t height = output->height * output->scale;
cairo_set_source_u32(cairo, config->colors.background);
cairo_rectangle(cairo, x, 0, width, height);
cairo_fill(cairo);
double text_y = height / 2.0 - text_height / 2.0;
cairo_set_source_u32(cairo, config->colors.statusline);
cairo_move_to(cairo, x + width / 2 - text_width / 2, (int)floor(text_y));
pango_printf(cairo, config->font, output->scale,
output->bar->mode_pango_markup, "%s", title);
pango_printf_ellipsized(cairo, config->font, output->scale,
output->bar->mode_pango_markup, max_width, "%s", title);
return output->height;
}
@ -686,6 +683,7 @@ static uint32_t render_to_cairo(cairo_t *cairo, struct swaybar_output *output) {
uint32_t h = render_status_line(cairo, output, &x);
max_height = h > max_height ? h : max_height;
}
double max_x = x;
x = 0;
if (config->workspace_buttons) {
struct swaybar_workspace *ws;
@ -700,7 +698,7 @@ static uint32_t render_to_cairo(cairo_t *cairo, struct swaybar_output *output) {
}
if (config->window_title) {
uint32_t h = render_window_title(cairo, output, x);
uint32_t h = render_window_title(cairo, output, x, max_x);
max_height = h > max_height ? h : max_height;
}