Skip to content

Commit c486020

Browse files
unitycoderunitycoder
committed
test fix for 2 monitors DPI issue #92 (upgrade to dotnet 4.8, add scaling options, save correct windowsize on window_resized)
1 parent ad2c6da commit c486020

File tree

6 files changed

+54
-43
lines changed

6 files changed

+54
-43
lines changed

‎UnityLauncherPro/App.config‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3+
<runtime>
4+
<AppContextSwitchOverrides value="Switch.System.Windows.DoNotScaleForDpiChanges=false"/>
5+
</runtime>
36
<configSections>
4-
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
5-
<section name="UnityLauncherPro.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
7+
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
8+
<section name="UnityLauncherPro.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
69
</sectionGroup>
710
</configSections>
811
<startup>
9-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
12+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
1013
</startup>
1114
<userSettings>
1215
<UnityLauncherPro.Properties.Settings>
@@ -41,10 +44,10 @@
4144
<value>False</value>
4245
</setting>
4346
<setting name="preferredVersion" serializeAs="String">
44-
<value />
47+
<value/>
4548
</setting>
4649
<setting name="newProjectsRoot" serializeAs="String">
47-
<value />
50+
<value/>
4851
</setting>
4952
<setting name="askNameForQuickProject" serializeAs="String">
5053
<value>True</value>
@@ -59,7 +62,7 @@
5962
<value>False</value>
6063
</setting>
6164
<setting name="webglBuildPath" serializeAs="String">
62-
<value />
65+
<value/>
6366
</setting>
6467
<setting name="useCustomTheme" serializeAs="String">
6568
<value>False</value>
@@ -92,10 +95,10 @@
9295
<value>0</value>
9396
</setting>
9497
<setting name="templatePackagesFolder" serializeAs="String">
95-
<value />
98+
<value/>
9699
</setting>
97100
<setting name="newProjectPlatform" serializeAs="String">
98-
<value />
101+
<value/>
99102
</setting>
100103
<setting name="searchProjectPathAlso" serializeAs="String">
101104
<value>False</value>
@@ -104,7 +107,7 @@
104107
<value>False</value>
105108
</setting>
106109
<setting name="shortcutBatchFileFolder" serializeAs="String">
107-
<value />
110+
<value/>
108111
</setting>
109112
<setting name="rootFolders" serializeAs="Xml">
110113
<value>
@@ -124,7 +127,7 @@
124127
</setting>
125128
<setting name="projectPaths" serializeAs="Xml">
126129
<value>
127-
<ArrayOfString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" />
130+
<ArrayOfString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"/>
128131
</value>
129132
</setting>
130133
<setting name="override40ProjectCount" serializeAs="String">
@@ -135,4 +138,4 @@
135138
</setting>
136139
</UnityLauncherPro.Properties.Settings>
137140
</userSettings>
138-
</configuration>
141+
</configuration>

‎UnityLauncherPro/MainWindow.xaml.cs‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -908,9 +908,24 @@ private void CloseThemeEditor()
908908
private void Window_SizeChanged(object sender, SizeChangedEventArgs e)
909909
{
910910
var win = (Window)sender;
911-
Properties.Settings.Default.windowWidth = (int)win.Width;
912-
Properties.Settings.Default.windowHeight = (int)win.Height;
911+
//Properties.Settings.Default.windowWidth = (int)win.Width;
912+
//Properties.Settings.Default.windowHeight = (int)win.Height;
913+
// save new size instead, to fix DPI scaling issue
914+
Properties.Settings.Default.windowWidth = (int)e.NewSize.Width;
915+
Properties.Settings.Default.windowHeight = (int)e.NewSize.Height;
913916
Properties.Settings.Default.Save();
917+
918+
//Console.WriteLine("Window_SizeChanged: " + win.Width + "x" + win.Height + " e:" + e.NewSize.Width + "x" + e.NewSize.Height);
919+
920+
//// get current screen DPI
921+
//PresentationSource source = PresentationSource.FromVisual(this);
922+
//double dpiX, dpiY;
923+
//if (source != null)
924+
//{
925+
// dpiX = 96.0 * source.CompositionTarget.TransformToDevice.M11;
926+
// dpiY = 96.0 * source.CompositionTarget.TransformToDevice.M22;
927+
// Console.WriteLine("new dpi: " + dpiX + "x" + dpiY);
928+
//}
914929
}
915930

916931
private void BtnLaunchProject_Click(object sender, RoutedEventArgs e)

‎UnityLauncherPro/Properties/Resources.Designer.cs‎

Lines changed: 18 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎UnityLauncherPro/Properties/Settings.Designer.cs‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎UnityLauncherPro/UnityLauncherPro.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<OutputType>WinExe</OutputType>
99
<RootNamespace>UnityLauncherPro</RootNamespace>
1010
<AssemblyName>UnityLauncherPro</AssemblyName>
11-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
11+
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
1212
<FileAlignment>512</FileAlignment>
1313
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1414
<WarningLevel>4</WarningLevel>
@@ -29,6 +29,7 @@
2929
<IsWebBootstrapper>false</IsWebBootstrapper>
3030
<UseApplicationTrust>false</UseApplicationTrust>
3131
<BootstrapperEnabled>true</BootstrapperEnabled>
32+
<TargetFrameworkProfile />
3233
</PropertyGroup>
3334
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3435
<PlatformTarget>AnyCPU</PlatformTarget>

‎UnityLauncherPro/app.manifest‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<!-- The combination of below two tags have the following effect :
5858
1) Per-Monitor for >= Windows 10 Anniversary Update
5959
2) System < Windows 10 Anniversary Update -->
60-
<dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitor</dpiAwareness>
60+
<dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
6161
<dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
6262
</windowsSettings>
6363
</application>

0 commit comments

Comments
 (0)