sway

commit 7dfc0409ebd14f256294118ded769cf4df56e758
parent 1a0d367f227fddd026ddf2a1bd21c5edbb111b00
Author: Ryan Dwyer <ryandwyer1@gmail.com>
Date:   Wed, 11 Apr 2018 08:34:21 +1000

Check height in surface local coordinates and rename some variables.

Diffstat:
M
swaybar/render.c
 | 
7
++++---

1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/swaybar/render.c b/swaybar/render.c
@@ -159,9 +159,10 @@ 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_height = sep_height + ws_vertical_padding * 2;
-			if (_ideal_height * output->scale > height) {
-				return _ideal_height;
+			uint32_t _ideal_surface_height = ws_vertical_padding * 2
+				+ sep_height;
+			if (_ideal_surface_height > surface_height) {
+				return _ideal_surface_height;
 			}
 			if (sep_width > block->separator_block_width) {
 				block->separator_block_width = sep_width + margin * 2;