浏览代码

fix max resolution obtaining

Veloe 4 月之前
父节点
当前提交
5722d8a0a9

+ 2 - 2
VeloeMinecraftLauncher/VeloeMinecraftLauncher.csproj

@@ -10,8 +10,8 @@
 		<DebugType>embedded</DebugType>
 		<StartupObject>VeloeMinecraftLauncher.Program</StartupObject>
 		<PlatformTarget>x64</PlatformTarget>
-		<AssemblyVersion>1.6.0.176</AssemblyVersion>
-		<FileVersion>1.6.0.176</FileVersion>
+		<AssemblyVersion>1.6.0.177</AssemblyVersion>
+		<FileVersion>1.6.0.177</FileVersion>
 		<Configurations>Debug;Release</Configurations>
 		<Copyright>MIT</Copyright>
 		<RepositoryType>git</RepositoryType>

+ 3 - 2
VeloeMinecraftLauncher/Views/SettingsView.axaml.cs

@@ -2,6 +2,7 @@ using System;
 using System.Linq;
 using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Input;
 using Avalonia.Markup.Xaml;
 
@@ -18,9 +19,9 @@ public partial class SettingsView : UserControl
         this.FindControl<NumericUpDown>("MaxLogEdit").AddHandler(TextInputEvent, NumericUpDown_TextInput, Avalonia.Interactivity.RoutingStrategies.Tunnel);
     }
 
-    private int MaxGameWidth => 1920;//Screens.All.Select(x => x.Bounds.Width).Max();
+    private int MaxGameWidth => (Avalonia.Application.Current.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime)?.MainWindow?.Screens.All.Select(x => x.Bounds.Width).Max() ?? 1920;
 
-    private int MaxGameHeight => 1080;//Screens.All.Select(x => x.Bounds.Height).Max();
+    private int MaxGameHeight => (Avalonia.Application.Current.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime)?.MainWindow?.Screens.All.Select(x => x.Bounds.Height).Max() ?? 1080;
 
     private long MaxRam => GC.GetGCMemoryInfo().TotalAvailableMemoryBytes / 1024 / 1024;