1
1
Ruben 2 жил өмнө
parent
commit
1f34cb53ee

+ 1 - 1
src/PicView/ChangeImage/Navigation.cs

@@ -125,7 +125,7 @@ internal static class Navigation
                 // Select next item
                 GalleryNavigation.SetSelected(next, true);
                 GalleryNavigation.SelectedGalleryItem = next;
-                UC.GetPicGallery.Scroller.ScrollToHorizontalOffset(GalleryNavigation.CenterScrollPosition);
+                GalleryNavigation.ScrollToGalleryCenter();
             });
         }
 

+ 5 - 5
src/PicView/ConfigureSettings/ConfigColors.cs

@@ -239,18 +239,18 @@ internal static class ConfigColors
 
     internal static Color GetSecondaryAccentColor => Settings.Default.ColorTheme switch
     {
-        0 => Color.FromRgb(182, 251, 95), // Blue
+        0 => Color.FromRgb(234, 182, 60), // Blue
         2 => Color.FromRgb(255, 237, 38), // Pink
         3 => Color.FromRgb(248, 175, 60), // Orange
         4 => Color.FromRgb(209, 237, 93), // Green
         5 => Color.FromRgb(250, 192, 92), // Red
         6 => Color.FromRgb(254, 172, 150), // Teal
-        7 => Color.FromRgb(79, 209, 117), // Aqua
-        8 => Color.FromRgb(252, 139, 111), // Golden
-        9 => Color.FromRgb(214, 232, 97), // Purple
+        7 => Color.FromRgb(228, 209, 17), // Aqua
+        8 => Color.FromRgb(255, 253, 42), // Golden
+        9 => Color.FromRgb(209, 237, 93), // Purple
         10 => Color.FromRgb(180, 246, 88), // Cyan
         11 => Color.FromRgb(255, 237, 38), // Magenta
-        12 => Color.FromRgb(202, 253, 82), // Lime
+        12 => Color.FromRgb(255, 253, 42), // Lime
         _ => throw new ArgumentOutOfRangeException(nameof(Settings.Default.ColorTheme)),
     };
 

+ 1 - 1
src/PicView/PicGallery/GalleryClick.cs

@@ -156,7 +156,7 @@ internal static class GalleryClick
             // Select next item
             GalleryNavigation.SetSelected(id, true);
             GalleryNavigation.SelectedGalleryItem = id;
-            GetPicGallery.Scroller.ScrollToHorizontalOffset(GalleryNavigation.CenterScrollPosition);
+            GalleryNavigation.ScrollToGalleryCenter();
         });
         // Change image
         await LoadPic.LoadPicAtIndexAsync(id).ConfigureAwait(false);

+ 0 - 1
src/PicView/PicGallery/GalleryLoad.cs

@@ -23,7 +23,6 @@ internal static class GalleryLoad
     {
         // Add events and set fields, when it's loaded.
         UC.GetPicGallery.Scroller.ScrollChanged += (_, _) => ConfigureWindows.GetMainWindow.Focus(); // Maintain window focus when scrolling manually
-        UC.GetPicGallery.Scroller.RequestBringIntoView += (_, e) => e.Handled = true;
         UC.GetPicGallery.grid.MouseLeftButtonDown += (_, _) => ConfigureWindows.GetMainWindow.Focus();
         UC.GetPicGallery.x2.MouseLeftButtonDown += (_, _) => GalleryToggle.CloseHorizontalGallery();
     }

+ 2 - 2
src/PicView/PicGallery/GalleryNavigation.cs

@@ -44,7 +44,7 @@ internal static class GalleryNavigation
         }
     }
 
-    internal static double CenterScrollPosition
+    private static double CenterScrollPosition
     {
         get
         {
@@ -77,7 +77,7 @@ internal static class GalleryNavigation
     /// <summary>
     /// Scrolls the gallery horizontally based on the specified parameters.
     /// </summary>
-    /// <param name="next">Specifies whether to scroll to the next item or the previous item.</param>
+    /// <param name="next">Specifies whether to scroll to the next or the previous page.</param>
     /// <param name="end">Specifies whether to scroll to the end of the gallery.</param>
     /// <param name="speedUp">Specifies whether to scroll at a faster speed.</param>
     /// <param name="animate">Specifies whether to animate the scrolling.</param>