From cb0b22cb795824d3268b8097a2feed6827de8c27 Mon Sep 17 00:00:00 2001 From: Todd Naugle Date: Mon, 21 Sep 2015 16:49:40 -0500 Subject: [PATCH] Hide create new item from Group Tab context menu Creating a new empty group from the group tab area just looks broken since nothing visible happens, so hide this item when the context menu is triggered from this location. --- gtk2_ardour/group_tabs.cc | 9 ++++++--- gtk2_ardour/group_tabs.h | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/gtk2_ardour/group_tabs.cc b/gtk2_ardour/group_tabs.cc index b31f64cf01..7fb62ae973 100644 --- a/gtk2_ardour/group_tabs.cc +++ b/gtk2_ardour/group_tabs.cc @@ -144,7 +144,7 @@ GroupTabs::on_button_press_event (GdkEventButton* ev) RouteGroupDialog d (g, false); d.do_run (); } else { - Menu* m = get_menu (g); + Menu* m = get_menu (g, true); if (m) { m->popup (ev->button, ev->time); } @@ -301,7 +301,7 @@ GroupTabs::click_to_tab (double c, list::iterator* prev, list::iterato } Gtk::Menu* -GroupTabs::get_menu (RouteGroup* g) +GroupTabs::get_menu (RouteGroup* g, bool TabArea) { using namespace Menu_Helpers; @@ -317,7 +317,10 @@ GroupTabs::get_menu (RouteGroup* g) _menu->set_name ("ArdourContextMenu"); MenuList& items = _menu->items(); - items.push_back (MenuElem (_("Create New Group ..."), hide_return (sigc::mem_fun(*this, &GroupTabs::create_and_add_group)))); + if (!TabArea) { + items.push_back (MenuElem (_("Create New Group ..."), hide_return (sigc::mem_fun(*this, &GroupTabs::create_and_add_group)))); + } + items.push_back (MenuElem (_("Create New Group From"), *new_from)); if (g) { diff --git a/gtk2_ardour/group_tabs.h b/gtk2_ardour/group_tabs.h index 41c6cfefee..16d6a85b31 100644 --- a/gtk2_ardour/group_tabs.h +++ b/gtk2_ardour/group_tabs.h @@ -46,7 +46,7 @@ public: /** @param g Route group, or 0. * @return Menu to be popped up on right-click over the given route group. */ - Gtk::Menu* get_menu (ARDOUR::RouteGroup* g); + Gtk::Menu* get_menu (ARDOUR::RouteGroup* g, bool tabArea = false); void run_new_group_dialog (ARDOUR::RouteList const &);