alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

swaybar: fix sep block width for mixed scales

Browse source 
When there are outputs with mixed scales, it was possible for swaybar to
alter `block->separator_block_width` for an output with a higher scale,
and use the changed value for a lower scale output. This caused there to
be larger than normal separation between blocks on the lower scale
outputs. The issue is more obvious the larger the scale difference
between the highest scale output and the lowest scale output.

This fixes the issue by using a local variable that is originally set to
`block->separator_block_width` for rendering, but if it needs to be
increased, the local variable is the only thing touched.
This commit is contained in:
Brian Ashworth 2018-12-10 12:25:17 -05:00 committed by emersion
parent 8b4fe7dd15
commit 549d9fe489
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
swaybar/render.c
View file

@ -163,6 +163,7 @@ static uint32_t render_status_block(cairo_t *cairo,
} }
int sep_width, sep_height; int sep_width, sep_height;
int sep_block_width = block->separator_block_width;
if (!edge) { if (!edge) {
if (config->sep_symbol) { if (config->sep_symbol) {
get_text_size(cairo, config->font, &sep_width, &sep_height, NULL, get_text_size(cairo, config->font, &sep_width, &sep_height, NULL,
@ -172,11 +173,11 @@ static uint32_t render_status_block(cairo_t *cairo,
if (output->height < _ideal_surface_height) { if (output->height < _ideal_surface_height) {
return _ideal_surface_height; return _ideal_surface_height;
} }
if (sep_width > block->separator_block_width) { if (sep_width > sep_block_width) {
block->separator_block_width = sep_width + margin * 2; sep_block_width = sep_width + margin * 2;
} }
} }
*x -= block->separator_block_width; *x -= sep_block_width;
} else { } else {
*x -= margin; *x -= margin;
} }
@ -261,16 +262,14 @@ static uint32_t render_status_block(cairo_t *cairo,
cairo_set_source_u32(cairo, config->colors.separator); cairo_set_source_u32(cairo, config->colors.separator);
} }
if (config->sep_symbol) { if (config->sep_symbol) {
offset = pos + (block->separator_block_width - sep_width) / 2; offset = pos + (sep_block_width - sep_width) / 2;
cairo_move_to(cairo, offset, height / 2.0 - sep_height / 2.0); cairo_move_to(cairo, offset, height / 2.0 - sep_height / 2.0);
pango_printf(cairo, config->font, output->scale, false, pango_printf(cairo, config->font, output->scale, false,
"%s", config->sep_symbol); "%s", config->sep_symbol);
} else { } else {
cairo_set_line_width(cairo, 1); cairo_set_line_width(cairo, 1);
cairo_move_to(cairo, cairo_move_to(cairo, pos + sep_block_width / 2, margin);
pos + block->separator_block_width / 2, margin); cairo_line_to(cairo, pos + sep_block_width / 2, height - margin);
cairo_line_to(cairo,
pos + block->separator_block_width / 2, height - margin);
cairo_stroke(cairo); cairo_stroke(cairo);
} }
} }