patch from brian to get consistent menu behaviour

git-svn-id: svn://localhost/ardour2/trunk@1155 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc
index 25fe14423340031fe9c63fce1c0828d0fcb56c8d..27b852982ac249cf19706b8441688bb47e5e776e 100644 (file)
--- a/gtk2_ardour/ardour_ui2.cc
+++ b/gtk2_ardour/ardour_ui2.cc
@@ -609,7 +609,7 @@ ARDOUR_UI::show_shuttle_context_menu ()
                build_shuttle_context_menu ();
        }
 
-       shuttle_context_menu->popup (1, 0);
+       shuttle_context_menu->popup (1, gtk_get_current_event_time());
 }
 
 void
@@ -815,7 +815,7 @@ ARDOUR_UI::shuttle_unit_clicked ()
        if (shuttle_unit_menu == 0) {
                shuttle_unit_menu = dynamic_cast<Menu*> (ActionManager::get_widget ("/ShuttleUnitPopup"));
        }
-       shuttle_unit_menu->popup (1, 0);
+       shuttle_unit_menu->popup (1, gtk_get_current_event_time());
 }
 
 void

diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc
index 50a2fc9b08f205c17f8eaee947987ad0c94ed073..424564f18bb297654ed31eca252c9a25c0501f6e 100644 (file)
--- a/gtk2_ardour/automation_time_axis.cc
+++ b/gtk2_ardour/automation_time_axis.cc
@@ -192,7 +192,7 @@ AutomationTimeAxisView::auto_clicked ()
                                           bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Touch)));
        }
 
-       automation_menu->popup (1, 0);
+       automation_menu->popup (1, gtk_get_current_event_time());
 }
 
 

diff --git a/gtk2_ardour/editor_edit_groups.cc b/gtk2_ardour/editor_edit_groups.cc
index 8df76fef258ca5c18c592a01efa1603e4d50a163..2ee1773646b78327812f95a0f0c4c900fa6a57a9 100644 (file)
--- a/gtk2_ardour/editor_edit_groups.cc
+++ b/gtk2_ardour/editor_edit_groups.cc
@@ -119,7 +119,7 @@ Editor::edit_group_list_button_press_event (GdkEventButton* ev)
                if (edit_group_list_menu == 0) {
                        build_edit_group_list_menu ();
                }
-               edit_group_list_menu->popup (1, 0);
+               edit_group_list_menu->popup (1, ev->time);
                return true;
        }
 

diff --git a/gtk2_ardour/editor_route_list.cc b/gtk2_ardour/editor_route_list.cc
index 3e2f1306912e0b49cf95da54a879dacf73e78f02..bad0854885fee17f82f2319af53c4c3d0bfb3f96 100644 (file)
--- a/gtk2_ardour/editor_route_list.cc
+++ b/gtk2_ardour/editor_route_list.cc
@@ -470,7 +470,7 @@ Editor::show_route_list_menu()
                build_route_list_menu ();
        }
 
-       route_list_menu->popup (1, 0);
+       route_list_menu->popup (1, gtk_get_current_event_time());
 }
 
 bool

diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc
index d42ebf1e7f0579300a2641e3c58bafec58ee63eb..ee0ba1d0249fe319733a7ea08337a9317e3e0e55 100644 (file)
--- a/gtk2_ardour/editor_rulers.cc
+++ b/gtk2_ardour/editor_rulers.cc
@@ -421,7 +421,7 @@ Editor::popup_ruler_menu (nframes_t where, ItemType t)
                mitem->set_active(true);
        }
        
-        editor_ruler_menu->popup (1, 0);
+        editor_ruler_menu->popup (1, gtk_get_current_event_time());
 
        no_ruler_shown_update = false;
 }

diff --git a/gtk2_ardour/ladspa_pluginui.cc b/gtk2_ardour/ladspa_pluginui.cc
index b1f193b862c0f7cb23d592c84edd83a62fd5d350..a8be71e85e4622edfe56be7e049aac1d2feffa63 100644 (file)
--- a/gtk2_ardour/ladspa_pluginui.cc
+++ b/gtk2_ardour/ladspa_pluginui.cc
@@ -579,7 +579,7 @@ LadspaPluginUI::astate_clicked (ControlUI* cui, uint32_t port)
        items.push_back (MenuElem (_("Touch"),
                                   bind (mem_fun(*this, &LadspaPluginUI::set_automation_state), (AutoState) Touch, cui)));
 
-       automation_menu->popup (1, 0);
+       automation_menu->popup (1, gtk_get_current_event_time());
 }
 
 void

diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc
index d8e5fc6988857999661458601d282ee2e1ba48bc..d983689e318a239bba4f14115933d68dfc325e2b 100644 (file)
--- a/gtk2_ardour/mixer_ui.cc
+++ b/gtk2_ardour/mixer_ui.cc
@@ -656,7 +656,7 @@ Mixer_UI::show_track_list_menu ()
                build_track_menu ();
        }
 
-       track_menu->popup (1, 0);
+       track_menu->popup (1, gtk_get_current_event_time());
 }
 
 bool
@@ -765,7 +765,7 @@ Mixer_UI::group_display_button_press (GdkEventButton* ev)
                if (mix_group_context_menu == 0) {
                        build_mix_group_context_menu ();
                }
-               mix_group_context_menu->popup (1, 0);
+               mix_group_context_menu->popup (1, ev->time);
                return true;
        }
 

diff --git a/gtk2_ardour/panner2d.cc b/gtk2_ardour/panner2d.cc
index 1fb94a1321130a292b9af83766052eedf3c6111b..1e6e4c16c943497925d5c2a9b047a6b745c25b99 100644 (file)
--- a/gtk2_ardour/panner2d.cc
+++ b/gtk2_ardour/panner2d.cc
@@ -593,7 +593,7 @@ Panner2d::show_context_menu ()
        } 
 
        bypass_menu_item->set_active (panner.bypassed());
-       context_menu->popup (1, 0);
+       context_menu->popup (1, gtk_get_current_event_time());
 }
 
 void

diff --git a/gtk2_ardour/route_params_ui.cc b/gtk2_ardour/route_params_ui.cc
index 5f61b0528cdf7f975ccde2adb53c4ac00e74946c..033537f8424675a84a48261a3521fdc7899e40a7 100644 (file)
--- a/gtk2_ardour/route_params_ui.cc
+++ b/gtk2_ardour/route_params_ui.cc
@@ -510,7 +510,7 @@ RouteParams_UI::show_track_menu()
                                (MenuElem (_("Add Track/Bus"), 
                                           mem_fun (*(ARDOUR_UI::instance()), &ARDOUR_UI::add_route)));
        }
-       track_menu->popup (1, 0);
+       track_menu->popup (1, gtk_get_current_event_time());
 }
 
 

diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index a616941fe9c812b82cd31d9e83dd66d83d51588e..cc51444d43bfea3e08407f620c556b076e6d275a 100644 (file)
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -358,7 +358,7 @@ RouteTimeAxisView::playlist_click ()
        
        build_playlist_menu (playlist_action_menu);
        editor.set_selected_track (*this, Selection::Add);
-       playlist_action_menu->popup (1, 0);
+       playlist_action_menu->popup (1, gtk_get_current_event_time());
 }
 
 void
@@ -371,7 +371,7 @@ RouteTimeAxisView::automation_click ()
                build_display_menu ();
        }
        editor.set_selected_track (*this, Selection::Add);
-       automation_action_menu->popup (1, 0);
+       automation_action_menu->popup (1, gtk_get_current_event_time());
 }
 
 void