prevent popup deactivation while button_down

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

diff --git a/cinelerra-5.0/guicast/bcpopupmenu.C b/cinelerra-5.0/guicast/bcpopupmenu.C
index e65b40d6552b11d7ecfb5ee0f507376c9148ba7e..3b7407d5408c4caafde4ecdb0176a3f925bfe711 100644 (file)
--- a/cinelerra-5.0/guicast/bcpopupmenu.C
+++ b/cinelerra-5.0/guicast/bcpopupmenu.C
@@ -330,7 +330,8 @@ int BC_PopupMenu::reposition_window(int x, int y)
 
 int BC_PopupMenu::focus_out_event()
 {
-       if( popup_down && !menu_popup->cursor_inside() )
+       if( popup_down && !get_button_down() &&
+           !cursor_inside() && !menu_popup->cursor_inside() )
                deactivate();
        return 0;
 }
@@ -507,8 +508,9 @@ int BC_PopupMenu::cursor_leave_event()
        }
 
 // dispatch to popup
-       if(popup_down)
-       {
+       if( popup_down ) {
+               if( !get_button_down() && !menu_popup->cursor_inside() )
+                       deactivate_menu();
                menu_popup->dispatch_cursor_leave();
        }