Gallery closing fixes

Ruben2776 · Nov 1, 2024 · a2f64f6 · a2f64f6
1 parent f53250e
commit a2f64f6
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 26 deletions.
diff --git a/src/PicView.Avalonia/CustomControls/GalleryAnimationControl.cs b/src/PicView.Avalonia/CustomControls/GalleryAnimationControl.cs
@@ -173,6 +173,7 @@ private async Task ClosedToBottomAnimation()
         await vm.GalleryItemStretchTask(SettingsHelper.Settings.Gallery.BottomGalleryStretchMode);
         await Dispatcher.UIThread.InvokeAsync(() =>
         {
+            Height = 0;
             IsVisible = true;
             Opacity = 1;
             WindowResizing.SetSize(vm);
@@ -203,32 +204,42 @@ await Dispatcher.UIThread.InvokeAsync(() =>
 
     private async Task BottomToClosedAnimation()
     {
-        if (DataContext is not MainViewModel vm || _isAnimating)
-        {
-            return;
-        }
-        await Dispatcher.UIThread.InvokeAsync(() =>
-        {
-            WindowResizing.SetSize(vm);
-            UIHelper.GetGalleryView.BlurMask.BlurEnabled = false;
-        });
-
-        vm.GalleryOrientation = Orientation.Horizontal;
-        vm.IsGalleryCloseIconVisible = false;
-        vm.GalleryMargin = new Thickness(2,0);
-        var from = vm.GalleryHeight;
-        const int to = 0;
-        const double speed = 0.7;
-        _isAnimating = true;
-        var heightAnimation = AnimationsHelper.HeightAnimation(from, to, speed);
-        await heightAnimation.RunAsync(this);
         await Dispatcher.UIThread.InvokeAsync(() =>
         {
-            Height = to;
+            Height = 0;
             IsVisible = false;
-            WindowResizing.SetSize(vm);
+            WindowResizing.SetSize(DataContext as MainViewModel);
         });
-        _isAnimating = false;
+
+        // TODO make fancy animation that resizes the window
+        // if (DataContext is not MainViewModel vm || _isAnimating)
+        // {
+        //     return;
+        // }
+        //
+        // var from = vm.GetBottomGalleryItemHeight + SizeDefaults.ScrollbarSize;
+        // await Dispatcher.UIThread.InvokeAsync(() =>
+        // {
+        //     Height = from;
+        //     Opacity = 1;
+        //     IsVisible = true;
+        //     UIHelper.GetGalleryView.BlurMask.BlurEnabled = false;
+        // });
+        //
+        // const int to = 0;
+        // const double speed = 0.7;
+        // var galleryHeightAnimation = AnimationsHelper.HeightAnimation(from, to, speed);
+        // _isAnimating = true;
+        // await galleryHeightAnimation.RunAsync(this);
+        // await Dispatcher.UIThread.InvokeAsync(() =>
+        // {
+        //     Height = to;
+        //     IsVisible = false;
+        //     WindowResizing.SetSize(vm);
+        // });
+        // _isAnimating = false;
+        // vm.GalleryOrientation = Orientation.Horizontal;
+        // vm.IsGalleryCloseIconVisible = false;
     }
 
     private async Task BottomToFullAnimation()

diff --git a/src/PicView.Avalonia/CustomControls/GalleryListBox.cs b/src/PicView.Avalonia/CustomControls/GalleryListBox.cs
@@ -20,7 +20,6 @@ public class GalleryListBox : ListBox
 
     public GalleryListBox()
     {
-        SelectionMode = SelectionMode.Single;
         AddHandler(PointerPressedEvent, PreviewPointerPressedEvent, RoutingStrategies.Tunnel);
     }
 

diff --git a/src/PicView.Avalonia/Gallery/GalleryFunctions.cs b/src/PicView.Avalonia/Gallery/GalleryFunctions.cs
@@ -311,11 +311,11 @@ public static async Task OpenCloseBottomGallery(MainViewModel vm)
 
         if (SettingsHelper.Settings.Gallery.IsBottomGalleryShown)
         {
-            SettingsHelper.Settings.Gallery.IsBottomGalleryShown = false;
-            IsFullGalleryOpen = false;
-            IsBottomGalleryOpen = false;
             vm.GalleryMode = GalleryMode.BottomToClosed;
             vm.GetIsShowingBottomGalleryTranslation = TranslationHelper.Translation.ShowBottomGallery;
+            SettingsHelper.Settings.Gallery.IsBottomGalleryShown = false;
+            // IsFullGalleryOpen = false;
+            // IsBottomGalleryOpen = false;
             await SettingsHelper.SaveSettingsAsync();
             return;
         }