#define TOTAL_IMAGES 3
-#define TRIANGLE_W 10
-#define TRIANGLE_H 10
+#define TRIANGLE_W xS(10)
+#define TRIANGLE_H yS(10)
BC_PopupMenu::BC_PopupMenu(int x, int y, int w, const char *text,
}
else {
// Move outside window if no title
- x = -10; y = -10;
- w = 10; h = 10;
+ x = -TRIANGLE_W; y = -TRIANGLE_H;
+ w = TRIANGLE_W; h = TRIANGLE_H;
}
BC_SubWindow::initialize();
int available_w = get_w() - calculate_w(margin, 0, use_title);
if( !icon ) {
- char truncated[BCTEXTLEN];
- truncate_text(truncated, text, available_w);
+ char *truncated = get_truncated_text(MEDIUMFONT, text, available_w);
set_font(MEDIUMFONT);
BC_WindowBase::draw_center_text(
dx + available_w/2 + margin + offset,
(int)((float)get_h()/2 + get_text_ascent(MEDIUMFONT)/2 - 2) + offset,
truncated);
+ delete [] truncated;
}
if( icon ) {
w, h, 0, 1);
}
else
- menu_popup->activate_menu(x+3, y+3, w, h, 0, 1);
+ menu_popup->activate_menu(x+xS(3), y+yS(3), w, h, 0, 1);
popup_down = 1;
if( use_title ) draw_title(1);
}