smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-09 07:05:43 +01:00
Code Issues Projects Releases Wiki Activity

fix scroll wheel handling on both gain faders and parameter controls in automation track headers

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@10903 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2011-12-05 18:17:31 +00:00
parent 0e92aee0b1
commit 3c3bceccf9
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/automation_time_axis.cc
View file

@ -182,6 +182,8 @@ AutomationTimeAxisView::AutomationTimeAxisView (
if (_controller) { if (_controller) {
/* add bar controller */ /* add bar controller */
controls_table.attach (*_controller.get(), 0, 8, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); 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 (); controls_table.show_all ();

5
gtk2_ardour/time_axis_view.cc
View file

@ -160,6 +160,7 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisVie
Gdk::SCROLL_MASK); Gdk::SCROLL_MASK);
controls_ebox.set_flags (CAN_FOCUS); 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_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_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)); 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 bool
TimeAxisView::controls_ebox_scroll (GdkEventScroll* ev) TimeAxisView::controls_ebox_scroll (GdkEventScroll* ev)
{ {
if (Keyboard::some_magic_widget_has_focus()) {
return false;
}
switch (ev->direction) { switch (ev->direction) {
case GDK_SCROLL_UP: case GDK_SCROLL_UP:
if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) { if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) {