play_off preview tweak, zoombar auto_color fix, deactivate popupmenu on click while...

[goodguy/cinelerra.git] / cinelerra-5.1 / guicast / bcpopupmenu.C

diff --git a/cinelerra-5.1/guicast/bcpopupmenu.C b/cinelerra-5.1/guicast/bcpopupmenu.C
index 80a02f6adc3b92790919763d1d06470efbbdfa07..ee78dbb371179e6770f8e73a97ab376c71d10798 100644 (file)
--- a/cinelerra-5.1/guicast/bcpopupmenu.C
+++ b/cinelerra-5.1/guicast/bcpopupmenu.C
@@ -134,28 +134,28 @@ int BC_PopupMenu::initialize()
 
 int BC_PopupMenu::set_images(VFrame **data)
 {
-       BC_Resources *resources = get_resources();
        for( int i=0; i<3; ++i ) {
                delete images[i];
                images[i] = new BC_Pixmap(parent_window, data[i], PIXMAP_ALPHA);
        }
 
-       if( w_argument >= 0 )
-               w = w_argument + margin +
-                       resources->popupmenu_triangle_margin;
-       else
-               w = get_text_width(MEDIUMFONT, text) + margin +
-                       resources->popupmenu_triangle_margin;
-
+       w = w_argument > 0 ? w_argument :
+               calculate_w(margin, get_text_width(MEDIUMFONT, text), use_title);
        h = images[BUTTON_UP]->get_h();
        return 0;
 }
 
-int BC_PopupMenu::calculate_w(int w_argument)
+int BC_PopupMenu::calculate_w(int margin, int text_width, int use_title)
+{
+       BC_Resources *resources = get_resources();
+       int l = margin >= 0 ? margin : resources->popupmenu_margin;
+       int r = use_title < 0 ? l : l + resources->popupmenu_triangle_margin;
+       return l + text_width + r;
+}
+
+int BC_PopupMenu::calculate_w(int text_width)
 {
-       return w_argument +
-               BC_WindowBase::get_resources()->popupmenu_margin +
-               BC_WindowBase::get_resources()->popupmenu_triangle_margin;
+       return calculate_w(-1, text_width, 0);
 }
 
 int BC_PopupMenu::calculate_h(VFrame **data)
@@ -200,24 +200,25 @@ int BC_PopupMenu::get_margin()
        return margin;
 }
 
-int BC_PopupMenu::draw_face(int dx)
+int BC_PopupMenu::draw_face(int dx, int color)
 {
        if( !use_title ) return 0;
-       BC_Resources *resources = get_resources();
 
 // Background
        draw_top_background(parent_window, 0, 0, w, h);
        draw_3segmenth(0, 0, w, images[status]);
 
 // Overlay text
-       set_color(get_resources()->popup_title_text);
+       if( color < 0 ) color = get_resources()->popup_title_text;
+       set_color(color);
+
        int offset = status == BUTTON_DN ? 1 : 0;
-       int available_w = get_w() - margin*2 - resources->popupmenu_triangle_margin;
+       int available_w = get_w() - calculate_w(margin, 0, use_title);
+
        if( !icon ) {
-               set_font(MEDIUMFONT);
                char truncated[BCTEXTLEN];
                truncate_text(truncated, 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,
@@ -230,15 +231,17 @@ int BC_PopupMenu::draw_face(int dx)
                        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;
 }
 
 int BC_PopupMenu::draw_title(int flush)
 {
-       draw_face(0);
+       draw_face(0, -1);
        flash(flush);
        return 0;
 }
@@ -294,6 +297,8 @@ int BC_PopupMenu::menu_activate()
                popup_down = 1;
                if( use_title ) draw_title(1);
        }
+       else
+               deactivate_menu();
        return 1;
 }
 
@@ -334,9 +339,7 @@ int BC_PopupMenu::repeat_event(int64_t duration)
 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();