浏览代码

Revert alpha build changes

Ruben 10 月之前
父节点
当前提交
bab283c729

+ 1 - 7
src/PicView.Avalonia.Win32/PicView.Avalonia.Win32.csproj

@@ -41,7 +41,7 @@
   </PropertyGroup>
   </PropertyGroup>
 
 
   <ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia.Themes.Simple" Version="11.3.999-cibuild0054873-alpha" />
+    <PackageReference Include="Avalonia.Themes.Simple" Version="11.2.3" />
     <PackageReference Include="Clowd.Clipboard.Avalonia" Version="1.1.4" />
     <PackageReference Include="Clowd.Clipboard.Avalonia" Version="1.1.4" />
   </ItemGroup>
   </ItemGroup>
 
 
@@ -81,10 +81,4 @@
 	<ItemGroup>
 	<ItemGroup>
 	  <UpToDateCheckInput Remove="Views\KeybindingsWindow.axaml" />
 	  <UpToDateCheckInput Remove="Views\KeybindingsWindow.axaml" />
 	</ItemGroup>
 	</ItemGroup>
-
-	<ItemGroup>
-	  <Reference Include="Avalonia.Themes.Simple">
-	    <HintPath>C:\Users\Ruben\.nuget\packages\avalonia.themes.simple\11.2.3\lib\net8.0\Avalonia.Themes.Simple.dll</HintPath>
-	  </Reference>
-	</ItemGroup>
 </Project>
 </Project>

+ 4 - 4
src/PicView.Avalonia/PicView.Avalonia.csproj

@@ -105,11 +105,11 @@
   </ItemGroup>
   </ItemGroup>
 
 
   <ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.3.999-cibuild0054873-alpha" />
-    <PackageReference Include="Avalonia.Desktop" Version="11.3.999-cibuild0054873-alpha" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="11.3.999-cibuild0054873-alpha" />
+    <PackageReference Include="Avalonia" Version="11.2.3" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.2.3" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="11.2.3" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.3.999-cibuild0054873-alpha" />
+    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.2.3" />
     <PackageReference Include="Avalonia.Svg.Skia" Version="11.2.0.2" />
     <PackageReference Include="Avalonia.Svg.Skia" Version="11.2.0.2" />
   </ItemGroup>
   </ItemGroup>
 
 

+ 0 - 16
src/PicView.Avalonia/StartUp/QuickLoad.cs

@@ -60,23 +60,7 @@ public static class QuickLoad
             {
             {
                 WindowFunctions.CenterWindowOnScreen();
                 WindowFunctions.CenterWindowOnScreen();
             }
             }
-            else
-            {
-                // Fixes bug with incorrect image size
-                vm.ImageViewer.Width = imageModel.PixelWidth;
-                vm.ImageViewer.Height = imageModel.PixelHeight;
-            }
         }, DispatcherPriority.Send);
         }, DispatcherPriority.Send);
-        
-        if (!Settings.WindowProperties.AutoFit)
-        {
-            // Revert back to auto sizing
-            Dispatcher.UIThread.Post(() =>
-            {
-                vm.ImageViewer.Width = double.NaN;
-                vm.ImageViewer.Height = double.NaN;
-            });
-        }
 
 
         vm.IsLoading = false;
         vm.IsLoading = false;