diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-04-10 22:18:54 -0400 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2018-04-10 22:18:54 -0400 |
commit | 5785170421dc38437acde8bb61068cd16fda716c (patch) | |
tree | 66698bd0384180609c0714efb7bb42e7c9fe4bb9 | |
parent | 84243a708e1f2bb6db6b04550b798dea5a5049d6 (diff) | |
download | sway-5785170421dc38437acde8bb61068cd16fda716c.tar.xz |
Fix separator height calculation
Fixes #1796
Also rearranged this code to more closely mirror the similar code above
so future discrepancies are easier to spot.
-rw-r--r-- | swaybar/render.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/swaybar/render.c b/swaybar/render.c index 3fd8da0b..26248d35 100644 --- a/swaybar/render.c +++ b/swaybar/render.c @@ -159,9 +159,9 @@ static uint32_t render_status_block(cairo_t *cairo, if (config->sep_symbol) { get_text_size(cairo, config->font, &sep_width, &sep_height, output->scale, false, "%s", config->sep_symbol); - uint32_t _ideal_surface_height = ws_vertical_padding * 2 - + sep_height; - if (_ideal_surface_height > surface_height) { + uint32_t _ideal_height = sep_height + ws_vertical_padding * 2; + uint32_t _ideal_surface_height = _ideal_height / output->scale; + if (surface_height < _ideal_surface_height) { return _ideal_surface_height; } if (sep_width > block->separator_block_width) { |