Remove LosingFocus from PipsPager (#6026)

microsoft · Oct 7, 2021 · 6a79363 · 6a79363
1 parent fb0e591
commit 6a79363
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 22 deletions.
diff --git a/dev/PipsPager/PipsPager.cpp b/dev/PipsPager/PipsPager.cpp
@@ -562,22 +562,6 @@ void PipsPager::OnGotFocus(const winrt::RoutedEventArgs& args)
     }
 }
 
-// In order to avoid switching visibility of the navigation buttons while moving focus inside the Pager,
-// we'll check if the next focused element is inside the Pager.
-void PipsPager::LosingFocus(const IInspectable& sender, const winrt::LosingFocusEventArgs& args)
-{
-    if (const auto repeater = m_pipsPagerRepeater.get())
-    {
-        if (const auto nextFocusElement = args.NewFocusedElement().try_as<winrt::UIElement>())
-        {
-            m_ifNextFocusElementInside = repeater.GetElementIndex(nextFocusElement) != -1
-                || nextFocusElement == m_previousPageButton.get()
-                || nextFocusElement == m_nextPageButton.get();
-
-        }
-    }
-}
-
 void PipsPager::OnPipsAreaGettingFocus(const IInspectable& sender, const winrt::GettingFocusEventArgs& args)
 {
     if (const auto repeater = m_pipsPagerRepeater.get())
@@ -615,11 +599,8 @@ void PipsPager::OnPipsAreaGettingFocus(const IInspectable& sender, const winrt::
 
 void PipsPager::OnLostFocus(const winrt::RoutedEventArgs& args)
 {
-    if (!m_ifNextFocusElementInside)
-    {
-        m_isFocused = false;
-        UpdateNavigationButtonVisualStates();
-    }
+    m_isFocused = false;
+    UpdateNavigationButtonVisualStates();
 }
 
 void PipsPager::OnPointerEntered(const winrt::PointerRoutedEventArgs& args)

diff --git a/dev/PipsPager/PipsPager.h b/dev/PipsPager/PipsPager.h
@@ -107,5 +107,4 @@ class PipsPager :
     int m_lastSelectedPageIndex{ -1 };
     bool m_isPointerOver{ false };
     bool m_isFocused{ false };
-    bool m_ifNextFocusElementInside{ false };
 };