#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();
{
BC_Resources *resources = get_resources();
int l = margin >= 0 ? margin : resources->popupmenu_margin;
- int r = use_title < 0 ? l : resources->popupmenu_triangle_margin;
+ int r = use_title < 0 ? l : l + resources->popupmenu_triangle_margin;
return l + text_width + r;
}
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 ) {
get_h()/2 - icon->get_h()/2 + offset);
}
- if( use_title >= 0 )
- draw_triangle_down_flat(available_w + margin,
- get_h()/2 - TRIANGLE_H/2, TRIANGLE_W, TRIANGLE_H);
+ if( use_title >= 0 ) {
+ int tx = get_w() - margin - get_resources()->popupmenu_triangle_margin;
+ int ty = get_h()/2 - TRIANGLE_H/2;
+ draw_triangle_down_flat(tx, ty, TRIANGLE_W, TRIANGLE_H);
+ }
return 1;
}
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);
}
+ else
+ deactivate_menu();
return 1;
}
int BC_PopupMenu::button_press_event()
{
int result = 0;
- if( get_buttonpress() == 1 &&
- is_event_win() &&
- use_title ) {
+ if( get_buttonpress() == 1 && is_event_win() && use_title ) {
top_level->hide_tooltip();
if( status == BUTTON_HI || status == BUTTON_UP ) status = BUTTON_DN;
activate_menu();