From 40ddd322a9efb71da589b916b022196b42a4baf7 Mon Sep 17 00:00:00 2001 From: vurtun Date: Wed, 16 Sep 2015 16:55:50 +0200 Subject: [PATCH] fixed toggle widget height calculation --- gui.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gui.c b/gui.c index 72798f4..f28cdea 100644 --- a/gui.c +++ b/gui.c @@ -3712,7 +3712,7 @@ gui_widget_toggle(struct gui_command_buffer *out, struct gui_rect r, toggle_active = *active; /* calculate the size of the complete toggle */ - select.w = MAX(font->height + 2 * toggle->padding.y, 1); + select.w = MIN(r.h, font->height + toggle->padding.y); select.h = select.w; select.x = r.x + toggle->padding.x; select.y = (r.y + toggle->padding.y + (select.w / 2)) - (font->height / 2); @@ -3723,7 +3723,7 @@ gui_widget_toggle(struct gui_command_buffer *out, struct gui_rect r, (gui_float)(gui_int)(select.h / 8); select.h = MAX(select.w, cursor_pad * 2); - cursor.h = select.w - cursor_pad * 2; + cursor.h = select.h - cursor_pad * 2; cursor.w = cursor.h; cursor.x = select.x + cursor_pad; cursor.y = select.y + cursor_pad;