From 7cd7927f0a9ab8591ec82cd756187536fe782346 Mon Sep 17 00:00:00 2001 From: Ben Loftis Date: Fri, 1 Aug 2014 13:23:25 -0500 Subject: [PATCH] fix gain entry cancellation, per the_CLA --- gtk2_ardour/mixer_strip.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 79ee7c34a5..2f73cb9866 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -426,7 +426,7 @@ MixerStrip::mixer_strip_enter_event (GdkEventCrossing *ev) //although we are triggering on the "enter", to the user it will appear that it is happenin on the "leave" //because the mixerstrip control is a parent that encompasses the strip - ARDOUR_UI::instance()->the_mixer()->deselect_all_strip_processors(); + deselect_all_processors(); return false; } @@ -438,8 +438,9 @@ MixerStrip::mixer_strip_leave_event (GdkEventCrossing *ev) if ( !(ev->detail == GDK_NOTIFY_INFERIOR) ) { _entered_mixer_strip= 0; - //clear keyboard focus in the gain display. this is cheesy but fixes a longstanding bug. + //clear keyboard focus in the gain display. this is cheesy but fixes a longstanding "bug" where the user starts typing in the gain entry, and leaves it active, thereby prohibiting other keybindings from working gpm.gain_display.set_sensitive(false); + gpm.show_gain(); gpm.gain_display.set_sensitive(true); //if we leave this mixer strip we need to clear out any selections