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

Merge pull request #1792 from RyanDwyer/fix-swaybar-status-blocks

Browse source 
Fix swaybar not showing all status blocks
This commit is contained in:
emersion 2018-04-10 18:38:43 -04:00 committed by GitHub
parent 96118be241 7dfc0409eb
commit 84243a708e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
swaybar/render.c
View file

@ -154,15 +154,15 @@ static uint32_t render_status_block(cairo_t *cairo,
block_width += block->border_right + margin; block_width += block->border_right + margin;
} }
int sep_width; int sep_width, sep_height;
if (!edge) { if (!edge) {
if (config->sep_symbol) { if (config->sep_symbol) {
int _height; get_text_size(cairo, config->font, &sep_width, &sep_height,
get_text_size(cairo, config->font, &sep_width, &_height,
output->scale, false, "%s", config->sep_symbol); output->scale, false, "%s", config->sep_symbol);
uint32_t _ideal_height = _height + ws_vertical_padding * 2; uint32_t _ideal_surface_height = ws_vertical_padding * 2
if ((uint32_t)_height < _ideal_height / output->scale) { + sep_height;
return _height / output->scale; if (_ideal_surface_height > surface_height) {
return _ideal_surface_height;
} }
if (sep_width > block->separator_block_width) { if (sep_width > block->separator_block_width) {
block->separator_block_width = sep_width + margin * 2; block->separator_block_width = sep_width + margin * 2;
@ -240,7 +240,7 @@ static uint32_t render_status_block(cairo_t *cairo,
} }
if (config->sep_symbol) { if (config->sep_symbol) {
offset = pos + (block->separator_block_width - sep_width) / 2; offset = pos + (block->separator_block_width - sep_width) / 2;
cairo_move_to(cairo, offset, margin); 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 {