Refactor, fix, misc.

Ruben2776 · Sep 18, 2024 · 2b716b2 · 2b716b2
1 parent 7065158
commit 2b716b2
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 9 deletions.
diff --git a/src/PicView.Avalonia/Navigation/Slideshow.cs b/src/PicView.Avalonia/Navigation/Slideshow.cs
@@ -54,8 +54,8 @@ public static void StopSlideshow(MainViewModel vm)
         _timer = null;
         vm.PlatformService.EnableScreensaver();
     }
-    
-    static bool InitiateAndStart(MainViewModel vm)
+
+    private static bool InitiateAndStart(MainViewModel vm)
     {
         if (!NavigationHelper.CanNavigate(vm))
         {
@@ -69,7 +69,10 @@ static bool InitiateAndStart(MainViewModel vm)
                 Enabled = true,
             };
             _timer.Elapsed += async (_, _) =>
+            {
+                // TODO: add animation
                 await vm.ImageIterator.NextIteration(NavigateTo.Next);
+            };
         }
         else if (_timer.Enabled)
         {
@@ -96,7 +99,7 @@ private static async Task Start(MainViewModel vm, double seconds)
         {
             await WindowHelper.ToggleFullscreen(vm, false);
         }
-        // TODO: add animation
+
         await vm.ImageIterator.NextIteration(NavigateTo.Next);
     }
 }
diff --git a/src/PicView.Avalonia/Views/UC/Menus/ImageMenu.axaml b/src/PicView.Avalonia/Views/UC/Menus/ImageMenu.axaml
@@ -284,6 +284,16 @@
                     </StackPanel>
                     <SplitButton.Flyout>
                         <MenuFlyout Placement="Top" ShowMode="Transient">
+                            <Button
+                                Background="Transparent"
+                                Command="{CompiledBinding StartSlideShowTask}"
+                                CommandParameter="2000"
+                                Width="86">
+                                <TextBlock Classes="txt">
+                                    <Run Text="2 " />
+                                    <Run Text="{CompiledBinding SecAbbreviation, Mode=OneWay}" />
+                                </TextBlock>
+                            </Button>
                             <Button
                                 Background="Transparent"
                                 Command="{CompiledBinding StartSlideShowTask}"

diff --git a/src/PicView.Avalonia/Views/UC/Menus/ImageMenu.axaml.cs b/src/PicView.Avalonia/Views/UC/Menus/ImageMenu.axaml.cs
@@ -1,6 +1,7 @@
 using System.Reactive.Linq;
 using Avalonia.Input;
 using PicView.Avalonia.CustomControls;
+using PicView.Avalonia.Navigation;
 using PicView.Avalonia.ViewModels;
 using ReactiveUI;
 
@@ -26,6 +27,11 @@ private async Task GoToPicBox_OnKeyDown(KeyEventArgs e)
                 return;
             }
 
+            if (!NavigationHelper.CanNavigate(vm))
+            {
+                return;
+            }
+
             if (!int.TryParse(GoToPicBox.Text, out var number))
             {
                 return;
@@ -44,11 +50,6 @@ private async Task GoToPicBox_OnKeyDown(KeyEventArgs e)
                 number--;
             }
 
-            if (vm.ImageIterator is null)
-            {
-                return;
-            }
-
             await vm.ImageIterator.IterateToIndex(number).ConfigureAwait(false);
         }
     }

diff --git a/src/PicView.WindowsNT/NativeMethods.cs b/src/PicView.WindowsNT/NativeMethods.cs
@@ -25,7 +25,7 @@ public static partial class NativeMethods
 
     public static void DisableScreensaver()
     {
-        _ = SetThreadExecutionState(ES_CONTINUOUS | ES_SYSTEM_REQUIRED | ES_DISPLAY_REQUIRED);
+        _ = SetThreadExecutionState(ES_CONTINUOUS | ES_DISPLAY_REQUIRED | ES_SYSTEM_REQUIRED);
     }
 
     public static void EnableScreensaver()