Fix DPI resize bug when importing PNGs

libertyernie · Nov 14, 2018 · 19bb554 · Milddy · Sep 10, 2021 · 19bb554
1 parent 9489697
commit 19bb554
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 2 deletions.
diff --git a/BrawlBox/BrawlBox.csproj b/BrawlBox/BrawlBox.csproj
@@ -166,6 +166,7 @@
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
+    <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="NodeWrappers\ClassicStageTblWrapper.cs" />

diff --git a/BrawlBox/Properties/AssemblyInfo.cs b/BrawlBox/Properties/AssemblyInfo.cs
@@ -26,6 +26,9 @@
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("aa25c3c0-9c54-4fd2-81bc-96efb4953a7b")]
 
+// This prevents resizes on monitors with different DPIs
+[assembly: System.Windows.Media.DisableDpiAwareness]
+
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version

diff --git a/BrawlBox/UI/Model Previewer/ModelEditControl/MiscFunctions.cs b/BrawlBox/UI/Model Previewer/ModelEditControl/MiscFunctions.cs
@@ -106,12 +106,12 @@ private void ModelEditControl_SizeChanged(object sender, EventArgs e)
         public void CheckDimensions()
         {
             int totalWidth = animEditors.Width;
-            Size s = new Size(animCtrlPnl.Width, animEditors.Height);
+            Drawing.Size s = new Drawing.Size(animCtrlPnl.Width, animEditors.Height);
             if (_currentControl != null && _currentControl.Visible)
             {
                 s = _currentControl.Visible ?
                     (_currentControl is SCN0Editor ? scn0Editor.GetDimensions() : _currentControl.MinimumSize) :
-                    (!weightEditor.Visible && !vertexEditor.Visible ? new Size(0, 0) : s);
+                    (!weightEditor.Visible && !vertexEditor.Visible ? new Drawing.Size(0, 0) : s);
             }
             else if (!weightEditor.Visible && !vertexEditor.Visible)
                 s = new Drawing.Size(0, 0);

diff --git a/BrawlLib/Properties/AssemblyInfo.cs b/BrawlLib/Properties/AssemblyInfo.cs
@@ -21,6 +21,9 @@
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("84b5ec46-630b-4225-beec-6082c28f85e6")]
 
+// This prevents resizes on monitors with different DPIs
+[assembly: System.Windows.Media.DisableDpiAwareness]
+
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version

diff --git a/Ikarus/Properties/AssemblyInfo.cs b/Ikarus/Properties/AssemblyInfo.cs
@@ -27,6 +27,9 @@
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("3a58aa6c-1b11-4e61-af15-51b70da5035a")]
 
+// This prevents resizes on monitors with different DPIs
+[assembly: System.Windows.Media.DisableDpiAwareness]
+
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version

diff --git a/Updater/Net.csproj b/Updater/Net.csproj
@@ -102,6 +102,7 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
+    <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Program.cs" />

diff --git a/Updater/Properties/AssemblyInfo.cs b/Updater/Properties/AssemblyInfo.cs
@@ -22,6 +22,9 @@
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("ee562171-2908-40ce-ba2d-35ff76fe9055")]
 
+// This prevents resizes on monitors with different DPIs
+[assembly: System.Windows.Media.DisableDpiAwareness]
+
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version