prevent popup deactivation while button_down

[goodguy/history.git] / cinelerra-5.0 / guicast / bcmenupopup.C

diff --git a/cinelerra-5.0/guicast/bcmenupopup.C b/cinelerra-5.0/guicast/bcmenupopup.C
index f03d64fe7acbb3c9c76ea552b36f429b823c631e..0d418cb8c4f442b3657d55eea63fb4a87cb42b38 100644 (file)
--- a/cinelerra-5.0/guicast/bcmenupopup.C
+++ b/cinelerra-5.0/guicast/bcmenupopup.C
@@ -19,6 +19,7 @@
  *
  */
 
+#include "bcdisplayinfo.h"
 #include "bcmenubar.h"
 #include "bcmenuitem.h"
 #include "bcmenupopup.h"
@@ -193,13 +194,11 @@ int BC_MenuPopup::dispatch_translation_event()
        if(popup)
        {
                int new_x = x +
-                       (top_level->last_translate_x -
-                       top_level->prev_x -
-                       top_level->get_resources()->get_left_border());
+                       (top_level->last_translate_x - top_level->prev_x -
+                       BC_DisplayInfo::get_left_border());
                int new_y = y +
-                       (top_level->last_translate_y -
-                       top_level->prev_y -
-                       top_level->get_resources()->get_top_border());
+                       (top_level->last_translate_y - top_level->prev_y -
+                       BC_DisplayInfo::get_top_border());
 
 // printf("BC_MenuPopup::dispatch_translation_event %d %d %d %d\n",
 // top_level->prev_x,
@@ -387,8 +386,8 @@ int BC_MenuPopup::get_dimensions()
                        menu_items.values[i]->h = 5;
                else
                {
-//                     menu_items.values[i]->h = top_level->get_text_height(MEDIUMFONT) + 4;
-                       menu_items.values[i]->h = item_bg[0]->get_h();
+                       menu_items.values[i]->h = item_bg[0] ? item_bg[0]->get_h() :
+                               top_level->get_text_height(MEDIUMFONT) + 4;
                }
 
                menu_items.values[i]->y = h;