From 9c7e23bad99d2c1cc32fb92abfadd4199a8686ed Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 22 Jun 2009 23:17:46 +0000 Subject: Popup the standard route group menu even when you don't right-click on a tab. git-svn-id: svn://localhost/ardour2/branches/3.0@5251 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/group_tabs.cc | 8 +++----- gtk2_ardour/group_tabs.h | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/gtk2_ardour/group_tabs.cc b/gtk2_ardour/group_tabs.cc index 433bd5fe2a..d9c34ed675 100644 --- a/gtk2_ardour/group_tabs.cc +++ b/gtk2_ardour/group_tabs.cc @@ -64,11 +64,8 @@ GroupTabs::on_button_press_event (GdkEventButton* ev) Tab* prev; Tab* next; Tab* t = click_to_tab (p, &prev, &next); - if (t == 0) { - return false; - } - if (ev->button == 1) { + if (ev->button == 1 && t) { _dragging = t; _drag_moved = false; @@ -87,7 +84,8 @@ GroupTabs::on_button_press_event (GdkEventButton* ev) } else if (ev->button == 3) { - get_menu(t->group)->popup (ev->button, ev->time); + RouteGroup* g = t ? t->group : 0; + get_menu(g)->popup (ev->button, ev->time); } diff --git a/gtk2_ardour/group_tabs.h b/gtk2_ardour/group_tabs.h index 861e66f285..c4ea5f1f31 100644 --- a/gtk2_ardour/group_tabs.h +++ b/gtk2_ardour/group_tabs.h @@ -76,7 +76,7 @@ private: /** @return Size of the widget along the primary axis */ virtual double extent () const = 0; - /** @param g Route group. + /** @param g Route group, or 0. * @return Menu to be popped up on right-click over the given route group. */ virtual Gtk::Menu* get_menu (ARDOUR::RouteGroup* g) = 0; -- cgit v1.2.3