Remove arrow key movement (as selection doesn't focus; see marticlime…

…nt#1217)
mrixner · Nov 27, 2024 · f61db05 · f61db05
1 parent fee02f9
commit f61db05
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 37 deletions.
diff --git a/src/UniGetUI/Pages/SoftwarePages/AbstractPackagesPage.xaml b/src/UniGetUI/Pages/SoftwarePages/AbstractPackagesPage.xaml
@@ -13,8 +13,8 @@
     Name="ABSTRACT_PAGE"
     NavigationCacheMode="Required"
     xmlns:animations="using:CommunityToolkit.WinUI.Animations" xmlns:pkgClasses="using:UniGetUI.PackageEngine.PackageClasses"
-    PreviewKeyDown="{x:Bind PackageList_PreviewKeyDown}"
     KeyDown="{x:Bind PackageList_KeyDown}">
+    <!-- PreviewKeyDown="{x:Bind PackageList_PreviewKeyDown}" -->
 
     <animations:Implicit.ShowAnimations>
         <animations:TranslationAnimation Duration="0:0:0.25" From="0,100,0" To="0"/>

diff --git a/src/UniGetUI/Pages/SoftwarePages/AbstractPackagesPage.xaml.cs b/src/UniGetUI/Pages/SoftwarePages/AbstractPackagesPage.xaml.cs
@@ -497,42 +497,42 @@ private void SelectAndScrollTo(int index)
         }
 
         // To avoid the default arrow key behavior
-        public void PackageList_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
-        {
-            int SelectedIndex = -1;
-            if (PackageList.SelectedItem is not null)
-            {
-                SelectedIndex = ((PackageWrapper)PackageList.SelectedItem).Index;
-            }
-
-            switch (e.Key)
-            {
-                case VirtualKey.Up:
-                    e.Handled = true;
-                    // no selection or first selected item
-                    if (SelectedIndex <= 0)
-                    {
-                        SelectAndScrollTo(FilteredPackages.Count - 1);
-                    }
-                    else
-                    {
-                        SelectAndScrollTo(SelectedIndex - 1);
-                    }
-                    break;
-                case VirtualKey.Down:
-                    e.Handled = true;
-                    // no selection or last selected item
-                    if (SelectedIndex < 0 || SelectedIndex == FilteredPackages.Count - 1)
-                    {
-                        SelectAndScrollTo(0);
-                    }
-                    else
-                    {
-                        SelectAndScrollTo(SelectedIndex + 1);
-                    }
-                    break;
-            }
-        }
+        // public void PackageList_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
+        // {
+        //     int SelectedIndex = -1;
+        //     if (PackageList.SelectedItem is not null)
+        //     {
+        //         SelectedIndex = ((PackageWrapper)PackageList.SelectedItem).Index;
+        //     }
+
+        //     switch (e.Key)
+        //     {
+        //         case VirtualKey.Up:
+        //             e.Handled = true;
+        //             // no selection or first selected item
+        //             if (SelectedIndex <= 0)
+        //             {
+        //                 SelectAndScrollTo(FilteredPackages.Count - 1);
+        //             }
+        //             else
+        //             {
+        //                 SelectAndScrollTo(SelectedIndex - 1);
+        //             }
+        //             break;
+        //         case VirtualKey.Down:
+        //             e.Handled = true;
+        //             // no selection or last selected item
+        //             if (SelectedIndex < 0 || SelectedIndex == FilteredPackages.Count - 1)
+        //             {
+        //                 SelectAndScrollTo(0);
+        //             }
+        //             else
+        //             {
+        //                 SelectAndScrollTo(SelectedIndex + 1);
+        //             }
+        //             break;
+        //     }
+        // }
 
         public void PackageList_KeyDown(object sender, KeyRoutedEventArgs e)
         {