diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-04-16 19:31:57 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-04-16 19:31:57 +0000 |
| commit | 7c3367c5439328ea89d7dc9495ba480982e41708 (patch) | |
| tree | a0507d2f8d26ba7cdccf0691101180587892c4e5 | |
| parent | 5ddedeec73e3b05b2800d0176c1330eff9b9070c (diff) | |
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
| -rw-r--r-- | gtk2_ardour/mixer_strip.cc | 12 | ||||
| -rw-r--r-- | gtk2_ardour/mixer_strip.h | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 9ff7696ecd..d21602894b 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -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 diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h index 3e264502a4..93bd5fd371 100644 --- a/gtk2_ardour/mixer_strip.h +++ b/gtk2_ardour/mixer_strip.h @@ -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*); |