Fix issue where SplitView overlay prevents clicking title bar buttons

Kinnara · Apr 24, 2020 · 93da03f · 93da03f
1 parent 4284bc5
commit 93da03f
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 0 deletions.
diff --git a/ModernWpf.Controls/SplitView/SplitView.cs b/ModernWpf.Controls/SplitView/SplitView.cs
@@ -117,6 +117,12 @@ private void OnWindowPreviewMouseDown(object sender, MouseButtonEventArgs e)
                 }
             }
 
+            if (e.OriginalSource is UIElement originalElement &&
+                TitleBarControl.GetInsideTitleBar(originalElement))
+            {
+                return;
+            }
+
             if (IsPaneOpen)
             {
                 e.Handled = true;

diff --git a/ModernWpf/TitleBar/TitleBarControl.cs b/ModernWpf/TitleBar/TitleBarControl.cs
@@ -37,6 +37,8 @@ public TitleBarControl()
             CommandBindings.Add(new CommandBinding(SystemCommands.MaximizeWindowCommand, MaximizeWindow));
             CommandBindings.Add(new CommandBinding(SystemCommands.RestoreWindowCommand, RestoreWindow));
             CommandBindings.Add(new CommandBinding(SystemCommands.CloseWindowCommand, CloseWindow));
+
+            SetInsideTitleBar(this, true);
         }
 
         #region IsActive
@@ -294,6 +296,27 @@ public bool ExtendViewIntoTitleBar
 
         #endregion
 
+        #region InsideTitleBar
+
+        internal static readonly DependencyProperty InsideTitleBarProperty =
+            DependencyProperty.RegisterAttached(
+                "InsideTitleBar",
+                typeof(bool),
+                typeof(TitleBarControl),
+                new FrameworkPropertyMetadata(false, FrameworkPropertyMetadataOptions.Inherits));
+
+        internal static bool GetInsideTitleBar(UIElement element)
+        {
+            return (bool)element.GetValue(InsideTitleBarProperty);
+        }
+
+        internal static void SetInsideTitleBar(UIElement element, bool value)
+        {
+            element.SetValue(InsideTitleBarProperty, value);
+        }
+
+        #endregion
+
         private Button BackButton { get; set; }
 
         private FrameworkElement LeftSystemOverlay { get; set; }