Merge branch 'develop'

gunt3001 · Jul 22, 2024 · 5208941 · 5208941
2 parents 627db46 + eef10eb
commit 5208941
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 2 deletions.
diff --git a/HsrGraphicsTool/HsrGraphicsTool.csproj b/HsrGraphicsTool/HsrGraphicsTool.csproj
@@ -7,7 +7,7 @@
         <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
         <ApplicationManifest>app.manifest</ApplicationManifest>
         <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
-        <Version>1.2</Version>
+        <Version>1.3</Version>
         <PublishSingleFile>true</PublishSingleFile>
         <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
     </PropertyGroup>
@@ -26,5 +26,6 @@
         <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.10" />
         <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.10" />
         <PackageReference Include="ReactiveUI.Fody" Version="19.5.41" />
+        <PackageReference Include="System.Drawing.Common" Version="8.0.7" />
     </ItemGroup>
 </Project>
diff --git a/HsrGraphicsTool/Models/DisplayUtils.cs b/HsrGraphicsTool/Models/DisplayUtils.cs
@@ -0,0 +1,31 @@
+using System.Drawing;
+using System.Runtime.InteropServices;
+
+namespace HsrGraphicsTool.Models;
+
+/// <summary>
+/// Utilities for capturing Windows display information using the Windows GDI API.
+/// Adapted from this S/O answer: https://stackoverflow.com/a/76670176
+/// </summary>
+public static class DisplayUtils
+{
+    [DllImport("gdi32.dll")]
+    private static extern int GetDeviceCaps(nint hdc, int nIndex);
+
+    private enum DeviceCap
+    {
+        Desktopvertres = 117,
+        Desktophorzres = 118
+    }
+
+    public static Size GetPhysicalDisplaySize()
+    {
+        var g = Graphics.FromHwnd(nint.Zero);
+        var desktop = g.GetHdc();
+
+        var physicalScreenHeight = GetDeviceCaps(desktop, (int)DeviceCap.Desktopvertres);
+        var physicalScreenWidth = GetDeviceCaps(desktop, (int)DeviceCap.Desktophorzres);
+
+        return new Size(physicalScreenWidth, physicalScreenHeight);
+    } 
+}
diff --git a/HsrGraphicsTool/ViewModels/MainWindowViewModel.cs b/HsrGraphicsTool/ViewModels/MainWindowViewModel.cs
@@ -138,6 +138,7 @@ public class MainWindowViewModel : ViewModelBase
 
     // Commands
 
+    public ReactiveCommand<Unit, Unit>? UsePrimaryMonitorResolution { get; }
     public ReactiveCommand<Unit, Unit>? DiscardChanges { get; }
     public ReactiveCommand<Unit, Unit>? ApplyChanges { get; }
 
@@ -208,6 +209,13 @@ public MainWindowViewModel(IHsrRegistryManager hsrRegistryManager)
             .Subscribe(_ => { GraphicsPreset = GraphicsPresetOption.Custom; });
 
         // Button commands
+        // Using primary montior resolution
+        UsePrimaryMonitorResolution = ReactiveCommand.Create(() =>
+        {
+            var screenSize = DisplayUtils.GetPhysicalDisplaySize();
+            Width = screenSize.Width;
+            Height = screenSize.Height;
+        });
         // Reverting changes
         DiscardChanges = ReactiveCommand.Create(() => ApplyConfigToProperties(LastKnownConfig));
         // Applying changes

diff --git a/HsrGraphicsTool/Views/MainWindow.axaml b/HsrGraphicsTool/Views/MainWindow.axaml
@@ -65,7 +65,7 @@
         <StackPanel Margin="10" IsVisible="{Binding !IsControlsDisabled}">
             <TextBlock Classes="header">Graphics Settings</TextBlock>
             <!-- Resolution options -->
-            <Grid Classes="option" ColumnDefinitions="140, 270">
+            <Grid Classes="option" ColumnDefinitions="140, 270" RowDefinitions="Auto, Auto">
                 <TextBlock Classes="option-label">Resolution</TextBlock>
                 <StackPanel Grid.Column="1" Orientation="Horizontal" Spacing="8" HorizontalAlignment="Right">
                     <NumericUpDown ShowButtonSpinner="False" Minimum="1" Increment="128" FormatString="0"
@@ -75,6 +75,10 @@
                                    Value="{Binding Height}" Width="50" />
                     <CheckBox IsChecked="{Binding IsFullscreen}">Full screen</CheckBox>
                 </StackPanel>
+                <Button Grid.Column="1" Grid.Row="1" Command="{Binding UsePrimaryMonitorResolution}"
+                        Classes="action">
+                    Use primary monitor resolution
+                </Button>
             </Grid>
             <Grid Classes="option" ColumnDefinitions="140, 270">
                 <TextBlock Classes="option-label">Graphics quality</TextBlock>