Skip to content

修复高DPI下的控件显示错乱问题 #234

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

修复高DPI下的控件显示错乱问题 #234

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
45eed49
Enable High DPI support
JDDKCN Jun 22, 2024
cc0a4bd
修复高DPI下的控件显示错乱问题
JDDKCN Sep 4, 2024
2c92327
Fix
JDDKCN Sep 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Source/GrasscutterTools/Forms/FormMain.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

73 changes: 50 additions & 23 deletions Source/GrasscutterTools/Forms/FormMain.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,10 @@
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="NavContainer.Location" type="System.Drawing.Point, System.Drawing">
<value>12, 12</value>
<value>19, 17</value>
</data>
<data name="NavContainer.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>5, 4, 5, 4</value>
</data>
<data name="ListPages.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
Expand All @@ -138,8 +141,11 @@
<data name="ListPages.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="ListPages.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>5, 4, 5, 4</value>
</data>
<data name="ListPages.Size" type="System.Drawing.Size, System.Drawing">
<value>150, 275</value>
<value>235, 388</value>
</data>
<data name="ListPages.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
Expand Down Expand Up @@ -187,10 +193,13 @@
<value>610</value>
</data>
<data name="NavContainer.Size" type="System.Drawing.Size, System.Drawing">
<value>810, 275</value>
<value>1273, 388</value>
</data>
<data name="NavContainer.SplitterDistance" type="System.Int32, mscorlib">
<value>150</value>
<value>235</value>
</data>
<data name="NavContainer.SplitterWidth" type="System.Int32, mscorlib">
<value>6</value>
</data>
<data name="NavContainer.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
Expand All @@ -211,10 +220,13 @@
<value>Top, Left, Right</value>
</data>
<data name="CmbCommand.Location" type="System.Drawing.Point, System.Drawing">
<value>115, 22</value>
<value>181, 31</value>
</data>
<data name="CmbCommand.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>5, 4, 5, 4</value>
</data>
<data name="CmbCommand.Size" type="System.Drawing.Size, System.Drawing">
<value>600, 25</value>
<value>941, 32</value>
</data>
<data name="CmbCommand.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
Expand All @@ -235,10 +247,13 @@
<value>NoControl</value>
</data>
<data name="BtnCopy.Location" type="System.Drawing.Point, System.Drawing">
<value>59, 22</value>
<value>93, 31</value>
</data>
<data name="BtnCopy.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>5, 4, 5, 4</value>
</data>
<data name="BtnCopy.Size" type="System.Drawing.Size, System.Drawing">
<value>50, 25</value>
<value>79, 35</value>
</data>
<data name="BtnCopy.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
Expand All @@ -265,10 +280,13 @@
<value>NoControl</value>
</data>
<data name="ChkAutoCopy.Location" type="System.Drawing.Point, System.Drawing">
<value>10, 24</value>
<value>16, 34</value>
</data>
<data name="ChkAutoCopy.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>5, 4, 5, 4</value>
</data>
<data name="ChkAutoCopy.Size" type="System.Drawing.Size, System.Drawing">
<value>51, 21</value>
<value>72, 28</value>
</data>
<data name="ChkAutoCopy.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
Expand Down Expand Up @@ -301,10 +319,13 @@
<value>NoControl</value>
</data>
<data name="LblClearFilter.Location" type="System.Drawing.Point, System.Drawing">
<value>680, 26</value>
<value>1069, 37</value>
</data>
<data name="LblClearFilter.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>5, 0, 5, 0</value>
</data>
<data name="LblClearFilter.Size" type="System.Drawing.Size, System.Drawing">
<value>16, 17</value>
<value>22, 24</value>
</data>
<data name="LblClearFilter.TabIndex" type="System.Int32, mscorlib">
<value>24</value>
Expand Down Expand Up @@ -334,10 +355,13 @@
<value>NoControl</value>
</data>
<data name="BtnInvokeOpenCommand.Location" type="System.Drawing.Point, System.Drawing">
<value>721, 22</value>
<value>1133, 31</value>
</data>
<data name="BtnInvokeOpenCommand.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>5, 4, 5, 4</value>
</data>
<data name="BtnInvokeOpenCommand.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 25</value>
<value>118, 35</value>
</data>
<data name="BtnInvokeOpenCommand.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
Expand All @@ -358,13 +382,19 @@
<value>1</value>
</data>
<data name="GrpCommand.Location" type="System.Drawing.Point, System.Drawing">
<value>12, 293</value>
<value>19, 414</value>
</data>
<data name="GrpCommand.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>5, 4, 5, 4</value>
</data>
<data name="GrpCommand.MinimumSize" type="System.Drawing.Size, System.Drawing">
<value>610, 56</value>
<value>959, 79</value>
</data>
<data name="GrpCommand.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>5, 4, 5, 4</value>
</data>
<data name="GrpCommand.Size" type="System.Drawing.Size, System.Drawing">
<value>810, 56</value>
<value>1273, 79</value>
</data>
<data name="GrpCommand.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
Expand Down Expand Up @@ -399,20 +429,17 @@
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
<value>7, 17</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>834, 361</value>
<value>1311, 510</value>
</data>
<data name="$this.Font" type="System.Drawing.Font, System.Drawing">
<value>Microsoft YaHei UI, 9pt</value>
</data>
<data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 4, 3, 4</value>
<value>5, 6, 5, 6</value>
</data>
<data name="$this.MinimumSize" type="System.Drawing.Size, System.Drawing">
<value>850, 400</value>
<value>1323, 542</value>
</data>
<data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
<value>CenterScreen</value>
Expand Down
1 change: 1 addition & 0 deletions Source/GrasscutterTools/GrasscutterTools.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,7 @@
<Compile Include="Utils\ArtifactUtils.cs" />
<Compile Include="Utils\Common.cs" />
<Compile Include="Utils\GuiRedirect.cs" />
<Compile Include="Utils\HighDPIUtil.cs" />
<Compile Include="Utils\KeyGo.cs" />
<Compile Include="Utils\HotKeyItem.cs" />
<Compile Include="Utils\HttpHelper.cs" />
Expand Down
92 changes: 67 additions & 25 deletions Source/GrasscutterTools/Pages/PageAchievement.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,14 +123,17 @@
</data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="ListAchievements.ItemHeight" type="System.Int32, mscorlib">
<value>17</value>
<value>24</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="ListAchievements.Location" type="System.Drawing.Point, System.Drawing">
<value>6, 51</value>
<value>9, 72</value>
</data>
<data name="ListAchievements.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>5, 4, 5, 4</value>
</data>
<data name="ListAchievements.Size" type="System.Drawing.Size, System.Drawing">
<value>628, 106</value>
<value>985, 148</value>
</data>
<data name="ListAchievements.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
Expand Down Expand Up @@ -160,10 +163,13 @@
<value>NoControl</value>
</data>
<data name="LblClearFilter.Location" type="System.Drawing.Point, System.Drawing">
<value>617, 25</value>
<value>970, 35</value>
</data>
<data name="LblClearFilter.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>5, 0, 5, 0</value>
</data>
<data name="LblClearFilter.Size" type="System.Drawing.Size, System.Drawing">
<value>16, 17</value>
<value>22, 24</value>
</data>
<data name="LblClearFilter.TabIndex" type="System.Int32, mscorlib">
<value>18</value>
Expand All @@ -190,10 +196,13 @@
<value>Top, Left, Right</value>
</data>
<data name="TxtAchievementFilter.Location" type="System.Drawing.Point, System.Drawing">
<value>6, 22</value>
<value>9, 31</value>
</data>
<data name="TxtAchievementFilter.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>5, 4, 5, 4</value>
</data>
<data name="TxtAchievementFilter.Size" type="System.Drawing.Size, System.Drawing">
<value>628, 23</value>
<value>985, 30</value>
</data>
<data name="TxtAchievementFilter.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
Expand All @@ -217,10 +226,13 @@
<value>True</value>
</data>
<data name="LnkRevokeAll.Location" type="System.Drawing.Point, System.Drawing">
<value>578, 0</value>
<value>908, 0</value>
</data>
<data name="LnkRevokeAll.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>5, 0, 5, 0</value>
</data>
<data name="LnkRevokeAll.Size" type="System.Drawing.Size, System.Drawing">
<value>56, 17</value>
<value>82, 24</value>
</data>
<data name="LnkRevokeAll.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
Expand All @@ -247,10 +259,13 @@
<value>True</value>
</data>
<data name="LnkGrantAll.Location" type="System.Drawing.Point, System.Drawing">
<value>516, 0</value>
<value>811, 0</value>
</data>
<data name="LnkGrantAll.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>5, 0, 5, 0</value>
</data>
<data name="LnkGrantAll.Size" type="System.Drawing.Size, System.Drawing">
<value>56, 17</value>
<value>82, 24</value>
</data>
<data name="LnkGrantAll.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
Expand All @@ -271,10 +286,16 @@
<value>4</value>
</data>
<data name="GrpAchievements.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 3</value>
<value>5, 4</value>
</data>
<data name="GrpAchievements.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>5, 4, 5, 4</value>
</data>
<data name="GrpAchievements.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>5, 4, 5, 4</value>
</data>
<data name="GrpAchievements.Size" type="System.Drawing.Size, System.Drawing">
<value>640, 167</value>
<value>1006, 236</value>
</data>
<data name="GrpAchievements.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
Expand All @@ -301,10 +322,13 @@
<value>Top, Right</value>
</data>
<data name="NUDProgress.Location" type="System.Drawing.Point, System.Drawing">
<value>579, 25</value>
<value>910, 35</value>
</data>
<data name="NUDProgress.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>5, 4, 5, 4</value>
</data>
<data name="NUDProgress.Size" type="System.Drawing.Size, System.Drawing">
<value>55, 23</value>
<value>86, 30</value>
</data>
<data name="NUDProgress.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
Expand All @@ -325,10 +349,13 @@
<value>Top, Right</value>
</data>
<data name="BtnProgress.Location" type="System.Drawing.Point, System.Drawing">
<value>473, 25</value>
<value>743, 35</value>
</data>
<data name="BtnProgress.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>5, 4, 5, 4</value>
</data>
<data name="BtnProgress.Size" type="System.Drawing.Size, System.Drawing">
<value>100, 23</value>
<value>157, 32</value>
</data>
<data name="BtnProgress.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
Expand All @@ -349,10 +376,13 @@
<value>1</value>
</data>
<data name="BtnRevoke.Location" type="System.Drawing.Point, System.Drawing">
<value>112, 25</value>
<value>176, 35</value>
</data>
<data name="BtnRevoke.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>5, 4, 5, 4</value>
</data>
<data name="BtnRevoke.Size" type="System.Drawing.Size, System.Drawing">
<value>100, 23</value>
<value>157, 32</value>
</data>
<data name="BtnRevoke.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
Expand All @@ -373,10 +403,13 @@
<value>2</value>
</data>
<data name="BtnGrant.Location" type="System.Drawing.Point, System.Drawing">
<value>6, 25</value>
<value>9, 35</value>
</data>
<data name="BtnGrant.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>5, 4, 5, 4</value>
</data>
<data name="BtnGrant.Size" type="System.Drawing.Size, System.Drawing">
<value>100, 23</value>
<value>157, 32</value>
</data>
<data name="BtnGrant.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
Expand All @@ -397,10 +430,16 @@
<value>3</value>
</data>
<data name="GrpAchievementCommands.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 176</value>
<value>5, 248</value>
</data>
<data name="GrpAchievementCommands.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>5, 4, 5, 4</value>
</data>
<data name="GrpAchievementCommands.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>5, 4, 5, 4</value>
</data>
<data name="GrpAchievementCommands.Size" type="System.Drawing.Size, System.Drawing">
<value>640, 60</value>
<value>1006, 85</value>
</data>
<data name="GrpAchievementCommands.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
Expand All @@ -424,12 +463,15 @@
<value>True</value>
</metadata>
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
<value>7, 17</value>
<value>11, 24</value>
</data>
<data name="$this.Size" type="System.Drawing.Size, System.Drawing">
<value>1015, 337</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>PageAchievement</value>
</data>
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>GrasscutterTools.Pages.BasePage, GrasscutterTools, Version=1.13.0.0, Culture=neutral, PublicKeyToken=de2b1c089621e923</value>
<value>GrasscutterTools.Pages.BasePage, GrasscutterTools, Version=1.15.2.0, Culture=neutral, PublicKeyToken=de2b1c089621e923</value>
</data>
</root>
Loading
Loading