mirrors
/
sway
mirror of https://github.com/swaywm/sway.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Check height in surface local coordinates and rename some variables.

This commit is contained in:
Ryan Dwyer 2018-04-11 08:34:21 +10:00
parent 1a0d367f22
commit 7dfc0409eb
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
swaybar/render.c
View File

@ -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;