Merge remote-tracking branch 'upstream/dev' into dev

mghe01 · mghe01 · commit 4d01bf95fc51 · 2026-02-06T10:24:27.000+11:00
diff --git a/.github/README.md b/.github/README.md
@@ -20,10 +20,10 @@ Enjoy a clean, free, and fast experience with no annoying pop-ups, and zero trac
 
 # Downloads
 
-[![](https://img.shields.io/badge/Windows-x64-blue?style=flat-square&logo=windows&logoColor=fff)](https://github.com/Ruben2776/PicView/releases/download/4.1.1/Setup-PicView-v4.1.1-win-x64.exe) [![](https://img.shields.io/badge/Windows-arm64-blue?style=flat-square&logo=windows&logoColor=fff)](https://github.com/Ruben2776/PicView/releases/download/4.1.1/Setup-PicView-v4.1.1-win-arm64.exe)
+[![](https://img.shields.io/badge/Windows-x64-blue?style=flat-square&logo=windows&logoColor=fff)](https://github.com/Ruben2776/PicView/releases/download/4.1.2/Setup-PicView-v4.1.2-win-x64.exe) [![](https://img.shields.io/badge/Windows-arm64-blue?style=flat-square&logo=windows&logoColor=fff)](https://github.com/Ruben2776/PicView/releases/download/4.1.2/Setup-PicView-v4.1.2-win-arm64.exe)
 
-[![](https://img.shields.io/badge/macOS-arm64%20(Apple%20Silicon)-blueviolet?style=flat-square&logo=apple&logoColor=fff)](https://github.com/Ruben2776/PicView/releases/download/4.1.1/PicView-4.1.1-macOS-arm64.dmg)
-[![](https://img.shields.io/badge/macOS-x64-blueviolet?style=flat-square&logo=apple&logoColor=fff)](https://github.com/Ruben2776/PicView/releases/download/4.1.1/PicView-4.1.1-macOS-x64.dmg)
+[![](https://img.shields.io/badge/macOS-arm64%20(Apple%20Silicon)-blueviolet?style=flat-square&logo=apple&logoColor=fff)](https://github.com/Ruben2776/PicView/releases/download/4.1.2/PicView-4.1.2-macOS-arm64.dmg)
+[![](https://img.shields.io/badge/macOS-x64-blueviolet?style=flat-square&logo=apple&logoColor=fff)](https://github.com/Ruben2776/PicView/releases/download/4.1.2/PicView-4.1.2-macOS-x64.dmg)
 
 [Latest releases at PicView.org](https://picview.org/download)
 
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -2,9 +2,9 @@
     <PropertyGroup>
         <Nullable>enable</Nullable>
         <AvaloniaVersion>11.3.8</AvaloniaVersion>
-        <VersionPrefix>4.1.1</VersionPrefix>
+        <VersionPrefix>4.1.2</VersionPrefix>
         <VersionSuffix></VersionSuffix>
-        <AssemblyVersion>4.1.1.0</AssemblyVersion>
-        <FileVersion>4.1.1</FileVersion>
+        <AssemblyVersion>4.1.2.0</AssemblyVersion>
+        <FileVersion>4.1.2</FileVersion>
     </PropertyGroup>
 </Project>
diff --git a/src/PicView.Avalonia/CustomControls/ZoomPanControl.cs b/src/PicView.Avalonia/CustomControls/ZoomPanControl.cs
@@ -199,6 +199,8 @@ public void ResetZoomSlim()
         SetScaleImmediate(1.0, CenterPoint());
 
         SetZoomValue(100);
+
+        _zoomPreviewer?.SetInvisible();
     }
 
     /// <summary>
@@ -232,6 +234,9 @@ public void SetConstrainedTranslation(double translateX, double translateY)
         TranslateY = translateY;
         ConstrainTranslationToBounds();
         UpdateChildTransform();
+
+        // Update preview window after transform change
+        UpdatePreviewWindow();
     }
 
     #endregion
@@ -301,6 +306,9 @@ private void HandlePanning(object? sender, PointerEventArgs e)
 
         ConstrainTranslationToBounds();
         UpdateChildTransform();
+
+        // Update preview window after transform change
+        UpdatePreviewWindow();
     }
 
     private void StopPanning(object? sender, PointerReleasedEventArgs e)
@@ -354,6 +362,9 @@ private void ZoomBy(double targetScale, bool animated = true, Point? zoomAtPoint
         {
             ResetZoom(animated);
         }
+
+        // Update preview window after transform change
+        UpdatePreviewWindow();
     }
 
     private void ApplyZoomAndTitle(double targetScale, Point center, bool animated)
@@ -441,9 +452,6 @@ private void UpdateChildTransform()
         _scaleTransform.ScaleY = Scale;
         _translateTransform.X = TranslateX;
         _translateTransform.Y = TranslateY;
-
-        // Update preview window after transform change
-        UpdatePreviewWindow();
     }
 
     private void SetTransitions(bool isAnimated)
diff --git a/src/PicView.Avalonia/StartUp/QuickLoad.cs b/src/PicView.Avalonia/StartUp/QuickLoad.cs
@@ -39,6 +39,11 @@ public static async ValueTask QuickLoadAsync(MainViewModel vm, string file, Wind
             vm.MainWindow.IsLoadingIndicatorShown.Value = true;
             Dispatcher.UIThread.Invoke(window.Show, DispatcherPriority.Send);
             await NavigationManager.LoadPicFromStringAsync(file, vm).ConfigureAwait(false);
+            if (Settings.WindowProperties.AutoFit)
+            {
+                await Dispatcher.UIThread.InvokeAsync(() => { WindowFunctions.CenterWindowOnScreen(); },
+                    DispatcherPriority.Send);
+            }
             return;
         }
 
@@ -47,6 +52,11 @@ public static async ValueTask QuickLoadAsync(MainViewModel vm, string file, Wind
             vm.MainWindow.IsLoadingIndicatorShown.Value = true;
             Dispatcher.UIThread.Invoke(window.Show, DispatcherPriority.Send);
             await NavigationManager.LoadPicFromArchiveAsync(file, vm).ConfigureAwait(false);
+            if (Settings.WindowProperties.AutoFit)
+            {
+                await Dispatcher.UIThread.InvokeAsync(() => { WindowFunctions.CenterWindowOnScreen(); },
+                    DispatcherPriority.Send);
+            }
             return;
         }
 
diff --git a/src/PicView.Avalonia/Views/UC/ZoomPreviewer.axaml.cs b/src/PicView.Avalonia/Views/UC/ZoomPreviewer.axaml.cs
@@ -285,13 +285,17 @@ private void UpdateSize(MainViewModel vm)
 
     private void RestartHideTimer()
     {
+        if (Opacity is 0)
+        {
+            return;
+        }
         _hideTimer?.Dispose();
         _hideTimer = new Timer(_ =>
         {
             Dispatcher.UIThread.Invoke(async () =>
             {
                 // Only hide if we're not dragging
-                if (!_isDragging && !IsPointerOver)
+                if (!_isDragging && !IsPointerOver && _zoomPanControl.Scale is not 1.0)
                 {
                     var opacityAnim = AnimationsHelper.OpacityAnimation(1, 0, TimeSpan.FromSeconds(0.5));
                     await opacityAnim.RunAsync(this);

Original file line number	Diff line number	Diff line change
`@@ -199,6 +199,8 @@ public void ResetZoomSlim()`
`199`	`199`	`SetScaleImmediate(1.0, CenterPoint());`
`200`	`200`
`201`	`201`	`SetZoomValue(100);`
	`202`	`+`
	`203`	`+ _zoomPreviewer?.SetInvisible();`
`202`	`204`	`}`
`203`	`205`
`204`	`206`	`/// <summary>`
`@@ -232,6 +234,9 @@ public void SetConstrainedTranslation(double translateX, double translateY)`
`232`	`234`	`TranslateY = translateY;`
`233`	`235`	`ConstrainTranslationToBounds();`
`234`	`236`	`UpdateChildTransform();`
	`237`	`+`
	`238`	`+ // Update preview window after transform change`
	`239`	`+ UpdatePreviewWindow();`
`235`	`240`	`}`
`236`	`241`
`237`	`242`	`#endregion`
`@@ -301,6 +306,9 @@ private void HandlePanning(object? sender, PointerEventArgs e)`
`301`	`306`
`302`	`307`	`ConstrainTranslationToBounds();`
`303`	`308`	`UpdateChildTransform();`
	`309`	`+`
	`310`	`+ // Update preview window after transform change`
	`311`	`+ UpdatePreviewWindow();`
`304`	`312`	`}`
`305`	`313`
`306`	`314`	`private void StopPanning(object? sender, PointerReleasedEventArgs e)`
`@@ -354,6 +362,9 @@ private void ZoomBy(double targetScale, bool animated = true, Point? zoomAtPoint`
`354`	`362`	`{`
`355`	`363`	`ResetZoom(animated);`
`356`	`364`	`}`
	`365`	`+`
	`366`	`+ // Update preview window after transform change`
	`367`	`+ UpdatePreviewWindow();`
`357`	`368`	`}`
`358`	`369`
`359`	`370`	`private void ApplyZoomAndTitle(double targetScale, Point center, bool animated)`
`@@ -441,9 +452,6 @@ private void UpdateChildTransform()`
`441`	`452`	`_scaleTransform.ScaleY = Scale;`
`442`	`453`	`_translateTransform.X = TranslateX;`
`443`	`454`	`_translateTransform.Y = TranslateY;`
`444`		`-`
`445`		`- // Update preview window after transform change`
`446`		`- UpdatePreviewWindow();`
`447`	`455`	`}`
`448`	`456`
`449`	`457`	`private void SetTransitions(bool isAnimated)`
Original file line number	Diff line number	Diff line change
`@@ -285,13 +285,17 @@ private void UpdateSize(MainViewModel vm)`
`285`	`285`
`286`	`286`	`private void RestartHideTimer()`
`287`	`287`	`{`
	`288`	`+ if (Opacity is 0)`
	`289`	`+ {`
	`290`	`+ return;`
	`291`	`+ }`
`288`	`292`	`_hideTimer?.Dispose();`
`289`	`293`	`_hideTimer = new Timer(_ =>`
`290`	`294`	`{`
`291`	`295`	`Dispatcher.UIThread.Invoke(async () =>`
`292`	`296`	`{`
`293`	`297`	`// Only hide if we're not dragging`
`294`		`- if (!_isDragging && !IsPointerOver)`
	`298`	`+ if (!_isDragging && !IsPointerOver && _zoomPanControl.Scale is not 1.0)`
`295`	`299`	`{`
`296`	`300`	`var opacityAnim = AnimationsHelper.OpacityAnimation(1, 0, TimeSpan.FromSeconds(0.5));`
`297`	`301`	`await opacityAnim.RunAsync(this);`