*h = frame->get_h();
*toggle_x = 0;
*toggle_y = 0;
- *text_x = *w + 5;
+ *text_x = *w + xS(5);
*text_y = 0;
*text_w = 0;
*text_h = 0;
if( caption ) {
*text_w = gui->get_text_width(font, caption);
- *text_h = gui->get_text_height(font);
+ *text_h = gui->get_text_height(font, caption);
if( resources->toggle_highlight_bg ) {
*text_w += resources->toggle_text_margin * 2;