X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fbcmenubar.C;h=4ed2baa8d84d3baa90496822a81d69e4c8198de7;hb=2f4e285f507feedad3dc641337ae081cd6635530;hp=908567ec592184381a3f141758a7833bc75ac0a1;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/guicast/bcmenubar.C b/cinelerra-5.1/guicast/bcmenubar.C index 908567ec..4ed2baa8 100644 --- a/cinelerra-5.1/guicast/bcmenubar.C +++ b/cinelerra-5.1/guicast/bcmenubar.C @@ -107,16 +107,16 @@ int BC_MenuBar::add_menu(BC_Menu* menu) // Get dimensions if(menu_titles.total == 0) - x = 2; + x = xS(2); else x = menu_titles.values[menu_titles.total - 1]->x + menu_titles.values[menu_titles.total - 1]->w; - w = get_text_width(MEDIUMFONT, menu->text) + 20; + w = get_text_width(MEDIUMFONT, menu->text) + xS(20); // get pointer menu_titles.append(menu); // initialize and draw - menu->initialize(top_level, this, x, 2, w, get_h() - 4); + menu->initialize(top_level, this, x, yS(2), w, get_h() - yS(4)); return 0; } @@ -186,6 +186,7 @@ int BC_MenuBar::keypress_event() result = menu_titles.values[i]->dispatch_keypress(); } } + if (!result) result = context_help_check_and_show(); return result; }