From 29a8238e4d34f1f15aec0b55e98bee080cf8fec5 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Thu, 10 Dec 2009 23:02:04 +0000
Subject: [PATCH] second part of:  fix up scrolling of pixfaders by making them
 grab keyboard magic focus when the mouse pointer is within them

git-svn-id: svn://localhost/ardour2/branches/3.0@6345 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 gtk2_ardour/editor.cc         | 4 ++++
 gtk2_ardour/time_axis_view.cc | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 5cbe2b7c6a..b31684920c 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -3956,6 +3956,10 @@ Editor::transport_punch_location()
 bool
 Editor::control_layout_scroll (GdkEventScroll* ev)
 {
+	if (Keyboard::some_magic_widget_has_focus()) {
+		return false;
+	}
+
 	switch (ev->direction) {
 	case GDK_SCROLL_UP:
 		scroll_tracks_up_line ();
diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc
index 577fbcdda6..6429148f4c 100644
--- a/gtk2_ardour/time_axis_view.cc
+++ b/gtk2_ardour/time_axis_view.cc
@@ -291,6 +291,10 @@ 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)) {