put mixer strip track name button context menu back on button3 ONLY, and make button1 press revert the display to the track if it was displaying a send

git-svn-id: svn://localhost/ardour2/branches/3.0@6918 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2010-04-16 19:31:57 +00:00
parent 5ddedeec73
commit 7c3367c543
2 changed files with 9 additions and 5 deletions

View File

@ -1401,17 +1401,21 @@ MixerStrip::build_route_ops_menu ()
items.push_back (MenuElem (_("Remove"), sigc::mem_fun(*this, &RouteUI::remove_this_route)));
}
gint
gboolean
MixerStrip::name_button_button_press (GdkEventButton* ev)
{
if (ev->button == 1 || ev->button == 3) {
if (ev->button == 3) {
list_route_operations ();
/* do not allow rename if the track is record-enabled */
rename_menu_item->set_sensitive (!_route->record_enabled());
route_ops_menu->popup (1, ev->time);
}
return FALSE;
} else if (ev->button == 1) {
revert_to_default_display ();
}
return false;
}
void

View File

@ -227,7 +227,7 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
Gtk::Menu* route_ops_menu;
void build_route_ops_menu ();
gint name_button_button_press (GdkEventButton*);
gboolean name_button_button_press (GdkEventButton*);
void list_route_operations ();
gint comment_key_release_handler (GdkEventKey*);