Don't return -1 from render_horizontal_item
This commit is contained in:
parent
e23e215471
commit
086211c83c
1 changed files with 9 additions and 13 deletions
22
main.c
22
main.c
|
@ -215,21 +215,17 @@ static int render_horizontal_item(struct menu_state *state, cairo_t *cairo, cons
|
||||||
get_text_size(cairo, state->font, &text_width, &text_height, NULL, 1, str);
|
get_text_size(cairo, state->font, &text_width, &text_height, NULL, 1, str);
|
||||||
int text_y = (state->line_height / 2.0) - (text_height / 2.0);
|
int text_y = (state->line_height / 2.0) - (text_height / 2.0);
|
||||||
|
|
||||||
if (x + left_padding + text_width > width) {
|
if (background) {
|
||||||
return -1;
|
int bg_width = text_width + left_padding + right_padding;
|
||||||
} else {
|
cairo_set_source_u32(cairo, background);
|
||||||
if (background) {
|
cairo_rectangle(cairo, x, y, bg_width, height);
|
||||||
int bg_width = text_width + left_padding + right_padding;
|
cairo_fill(cairo);
|
||||||
cairo_set_source_u32(cairo, background);
|
|
||||||
cairo_rectangle(cairo, x, y, bg_width, height);
|
|
||||||
cairo_fill(cairo);
|
|
||||||
}
|
|
||||||
|
|
||||||
cairo_move_to(cairo, x + left_padding, y + text_y);
|
|
||||||
cairo_set_source_u32(cairo, foreground);
|
|
||||||
pango_printf(cairo, state->font, 1, str);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
cairo_move_to(cairo, x + left_padding, y + text_y);
|
||||||
|
cairo_set_source_u32(cairo, foreground);
|
||||||
|
pango_printf(cairo, state->font, 1, str);
|
||||||
|
|
||||||
return x + text_width + left_padding + right_padding;
|
return x + text_width + left_padding + right_padding;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue