diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-12-05 18:17:31 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-12-05 18:17:31 +0000 |
| commit | 3c3bceccf91ce622dffdfe7042e88bfa8a798d2e (patch) | |
| tree | c0298f43c5c05dbbc95b1062b575c824b4503ceb /gtk2_ardour/time_axis_view.cc | |
| parent | 0e92aee0b1ebc41c8475dea2548df63ffe82e4a0 (diff) | |
fix scroll wheel handling on both gain faders and parameter controls in automation track headers
git-svn-id: svn://localhost/ardour2/branches/3.0@10903 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/time_axis_view.cc')
| -rw-r--r-- | gtk2_ardour/time_axis_view.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc index b2a9653b4c..56dd2b746d 100644 --- a/gtk2_ardour/time_axis_view.cc +++ b/gtk2_ardour/time_axis_view.cc @@ -160,6 +160,7 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisVie Gdk::SCROLL_MASK); controls_ebox.set_flags (CAN_FOCUS); + /* note that this handler connects *before* the default handler */ controls_ebox.signal_scroll_event().connect (sigc::mem_fun (*this, &TimeAxisView::controls_ebox_scroll), true); controls_ebox.signal_button_press_event().connect (sigc::mem_fun (*this, &TimeAxisView::controls_ebox_button_press)); controls_ebox.signal_button_release_event().connect (sigc::mem_fun (*this, &TimeAxisView::controls_ebox_button_release)); @@ -319,10 +320,6 @@ TimeAxisView::clip_to_viewport () bool TimeAxisView::controls_ebox_scroll (GdkEventScroll* ev) { - if (Keyboard::some_magic_widget_has_focus()) { - return false; - } - switch (ev->direction) { case GDK_SCROLL_UP: if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) { |