Fixes scrolling of RibbonTabControl if focus/mouse is outside of it

fluentribbon · Feb 15, 2018 · 176eee0 · 176eee0
1 parent 1d74393
commit 176eee0
Showing 1 changed file with 11 additions and 21 deletions.
diff --git a/Fluent.Ribbon/Controls/RibbonTabControl.cs b/Fluent.Ribbon/Controls/RibbonTabControl.cs
@@ -13,6 +13,7 @@ namespace Fluent
     using System.Windows.Input;
     using System.Windows.Media;
     using ControlzEx.Standard;
+    using Fluent.Internal;
     using Fluent.Internal.KnownBoxes;
 
     /// <summary>
@@ -597,23 +598,6 @@ protected override void OnKeyDown(KeyEventArgs e)
 
         #region Private methods
 
-        private static bool IsRibbonGroupBoxAncestorOf(DependencyObject element)
-        {
-            while (element != null)
-            {
-                if (element is RibbonGroupBox)
-                {
-                    return true;
-                }
-
-                var parent = LogicalTreeHelper.GetParent(element) ?? VisualTreeHelper.GetParent(element);
-
-                element = parent;
-            }
-
-            return false;
-        }
-
         // Process mouse wheel event
         internal void ProcessMouseWheel(MouseWheelEventArgs e)
         {
@@ -624,10 +608,16 @@ internal void ProcessMouseWheel(MouseWheelEventArgs e)
             }
 
             var focusedElement = Keyboard.FocusedElement as DependencyObject;
-
-            // Prevent scrolling if any control inside a RibbonGroupBox has focus
-            if (focusedElement != null
-                && IsRibbonGroupBoxAncestorOf(focusedElement))
+            var originalSource = e.OriginalSource as DependencyObject;
+
+            // Prevent scrolling if
+            // - any control inside a RibbonGroupBox has focus
+            // - any control outside this RibbonTabControl caused the mouse wheel event
+            if ((focusedElement != null
+                && UIHelper.GetParent<RibbonGroupBox>(focusedElement) != null)
+                ||
+                (originalSource != null
+                && UIHelper.GetParent<RibbonTabControl>(originalSource) == null))
             {
                 return;
             }