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
This commit is contained in:
parent
0e92aee0b1
commit
3c3bceccf9
|
@ -182,6 +182,8 @@ AutomationTimeAxisView::AutomationTimeAxisView (
|
|||
if (_controller) {
|
||||
/* add bar controller */
|
||||
controls_table.attach (*_controller.get(), 0, 8, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
|
||||
/* note that this handler connects *before* the default handler */
|
||||
_controller->event_widget().signal_scroll_event().connect (mem_fun (*this, &AutomationTimeAxisView::controls_ebox_scroll), false);
|
||||
}
|
||||
|
||||
controls_table.show_all ();
|
||||
|
|
|
@ -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)) {
|
||||
|
|
Loading…
Reference in New Issue