Fix issue with settings button in top mode not receiving pointer even…

…ts (microsoft/microsoft-ui-xaml#2442)
Kinnara · May 27, 2020 · fa446fe · fa446fe
1 parent 22f15fe
commit fa446fe
Showing 1 changed file with 18 additions and 17 deletions.
diff --git a/ModernWpf.Controls/NavigationView/NavigationViewItem.cs b/ModernWpf.Controls/NavigationView/NavigationViewItem.cs
@@ -88,26 +88,27 @@ public override void OnApplyTemplate()
 
             }
 
-            if (GetTemplateChildT<NavigationViewItemPresenter>(c_navigationViewItemPresenterName, controlProtected) is { } presenter)
+            UIElement presenter;
             {
-                m_navigationViewItemPresenter = presenter;
-
-                presenter.MouseDown += OnPresenterPointerPressed;
-                presenter.MouseUp += OnPresenterPointerReleased;
-                presenter.MouseEnter += OnPresenterPointerEntered;
-                presenter.MouseLeave += OnPresenterPointerCanceled;
-                presenter.LostMouseCapture += OnPresenterPointerCaptureLost;
-            }
-            // WPF
-            else
-            {
-                MouseDown += OnPresenterPointerPressed;
-                MouseUp += OnPresenterPointerReleased;
-                MouseEnter += OnPresenterPointerEntered;
-                MouseLeave += OnPresenterPointerCanceled;
-                LostMouseCapture += OnPresenterPointerCaptureLost;
+                presenter = init();
+                UIElement init()
+                {
+                    if (GetTemplateChildT<NavigationViewItemPresenter>(c_navigationViewItemPresenterName, controlProtected) is { } presenter)
+                    {
+                        m_navigationViewItemPresenter = presenter;
+                        return presenter;
+                    }
+                    // We don't have a presenter, so we are our own presenter.
+                    return this;
+                }
             }
 
+            presenter.MouseDown += OnPresenterPointerPressed;
+            presenter.MouseUp += OnPresenterPointerReleased;
+            presenter.MouseEnter += OnPresenterPointerEntered;
+            presenter.MouseLeave += OnPresenterPointerCanceled;
+            presenter.LostMouseCapture += OnPresenterPointerCaptureLost;
+
             m_toolTip = GetTemplateChildT<ToolTip>("ToolTip", controlProtected);
 
             if (GetSplitView() is { } splitView)