Kinda fixed dpi stuff???

This commit is contained in:
Goatgarien
2022-03-22 23:40:53 -07:00
parent 058ca0fe7e
commit 9963a1caa3
3 changed files with 1465 additions and 1344 deletions
+6
View File
@@ -98,6 +98,9 @@
<SubSystem>Windows</SubSystem>
<EntryPointSymbol>main</EntryPointSymbol>
</Link>
<Manifest>
<EnableDpiAwareness>false</EnableDpiAwareness>
</Manifest>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
@@ -124,6 +127,9 @@
<SubSystem>Windows</SubSystem>
<EntryPointSymbol>main</EntryPointSymbol>
</Link>
<Manifest>
<EnableDpiAwareness>false</EnableDpiAwareness>
</Manifest>
</ItemDefinitionGroup>
<ItemGroup>
<Reference Include="irrKlang.NET4">
+1324 -1293
View File
File diff suppressed because it is too large Load Diff
+135 -51
View File
@@ -180,7 +180,7 @@
<value>0, 0</value>
</data>
<data name="menuStrip.Size" type="System.Drawing.Size, System.Drawing">
<value>981, 24</value>
<value>990, 24</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="menuStrip.TabIndex" type="System.Int32, mscorlib">
@@ -199,7 +199,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;menuStrip.ZOrder" xml:space="preserve">
<value>15</value>
<value>14</value>
</data>
<data name="TapButton.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -207,11 +207,14 @@
<data name="TapButton.Font" type="System.Drawing.Font, System.Drawing">
<value>Microsoft Sans Serif, 8.25pt, style=Bold</value>
</data>
<data name="TapButton.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="TapButton.Location" type="System.Drawing.Point, System.Drawing">
<value>6, 19</value>
</data>
<data name="TapButton.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 25</value>
<value>75, 23</value>
</data>
<data name="TapButton.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@@ -454,6 +457,9 @@ otherwise it will crash.</value>
<data name="&gt;&gt;EndChartButton.ZOrder" xml:space="preserve">
<value>4</value>
</data>
<data name="NoteTypeBox.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="BonusFlairRadioButton.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@@ -580,10 +586,10 @@ Tap, Orange Flicks, and Green Flicks
<value>3</value>
</data>
<data name="NoteTypeBox.Location" type="System.Drawing.Point, System.Drawing">
<value>6, 27</value>
<value>12, 27</value>
</data>
<data name="NoteTypeBox.Size" type="System.Drawing.Size, System.Drawing">
<value>678, 77</value>
<value>678, 86</value>
</data>
<data name="NoteTypeBox.TabIndex" type="System.Int32, mscorlib">
<value>14</value>
@@ -601,7 +607,7 @@ Tap, Orange Flicks, and Green Flicks
<value>$this</value>
</data>
<data name="&gt;&gt;NoteTypeBox.ZOrder" xml:space="preserve">
<value>14</value>
<value>13</value>
</data>
<data name="BPMChange.Location" type="System.Drawing.Point, System.Drawing">
<value>87, 19</value>
@@ -782,7 +788,7 @@ Notes that appear are from End 1 -&gt; End 2</value>
<value>6, 32</value>
</data>
<data name="VisualHispeed.Size" type="System.Drawing.Size, System.Drawing">
<value>81, 20</value>
<value>85, 20</value>
</data>
<data name="VisualHispeed.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@@ -837,11 +843,14 @@ Default: 0.5 (1/2 of a measure)</value>
<data name="&gt;&gt;label2.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="InsertButton.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="InsertButton.Location" type="System.Drawing.Point, System.Drawing">
<value>351, 325</value>
<value>351, 348</value>
</data>
<data name="InsertButton.Size" type="System.Drawing.Size, System.Drawing">
<value>333, 48</value>
<value>339, 49</value>
</data>
<data name="InsertButton.TabIndex" type="System.Int32, mscorlib">
<value>21</value>
@@ -859,7 +868,7 @@ Default: 0.5 (1/2 of a measure)</value>
<value>$this</value>
</data>
<data name="&gt;&gt;InsertButton.ZOrder" xml:space="preserve">
<value>13</value>
<value>12</value>
</data>
<data name="PosLabel.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -1158,6 +1167,9 @@ Default: 0.5 (1/2 of a measure)</value>
<data name="&gt;&gt;Beat.ZOrder" xml:space="preserve">
<value>7</value>
</data>
<data name="GimmickBox.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="RemoveMask.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@@ -1216,10 +1228,10 @@ Default: 0.5 (1/2 of a measure)</value>
<value>6</value>
</data>
<data name="GimmickBox.Location" type="System.Drawing.Point, System.Drawing">
<value>6, 110</value>
<value>12, 119</value>
</data>
<data name="GimmickBox.Size" type="System.Drawing.Size, System.Drawing">
<value>496, 77</value>
<value>496, 84</value>
</data>
<data name="GimmickBox.TabIndex" type="System.Int32, mscorlib">
<value>15</value>
@@ -1237,7 +1249,10 @@ Default: 0.5 (1/2 of a measure)</value>
<value>$this</value>
</data>
<data name="&gt;&gt;GimmickBox.ZOrder" xml:space="preserve">
<value>12</value>
<value>11</value>
</data>
<data name="GimmickSettingsBox.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="ReverseEnd2SBNum2.Location" type="System.Drawing.Point, System.Drawing">
<value>274, 149</value>
@@ -1843,10 +1858,10 @@ Default: 0.5 (1/2 of a measure)</value>
<value>22</value>
</data>
<data name="GimmickSettingsBox.Location" type="System.Drawing.Point, System.Drawing">
<value>12, 193</value>
<value>12, 209</value>
</data>
<data name="GimmickSettingsBox.Size" type="System.Drawing.Size, System.Drawing">
<value>333, 180</value>
<value>333, 188</value>
</data>
<data name="GimmickSettingsBox.TabIndex" type="System.Int32, mscorlib">
<value>23</value>
@@ -1864,7 +1879,13 @@ Default: 0.5 (1/2 of a measure)</value>
<value>$this</value>
</data>
<data name="&gt;&gt;GimmickSettingsBox.ZOrder" xml:space="preserve">
<value>11</value>
<value>10</value>
</data>
<data name="InitialSettingsPane.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Right</value>
</data>
<data name="InitialSettingsPane.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="InitialSetSave.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Bottom</value>
@@ -1873,7 +1894,7 @@ Default: 0.5 (1/2 of a measure)</value>
<value>3, 134</value>
</data>
<data name="InitialSetSave.Size" type="System.Drawing.Size, System.Drawing">
<value>273, 23</value>
<value>276, 23</value>
</data>
<data name="InitialSetSave.TabIndex" type="System.Int32, mscorlib">
<value>42</value>
@@ -2164,10 +2185,10 @@ Default: 0.5 (1/2 of a measure)</value>
<value>10</value>
</data>
<data name="InitialSettingsPane.Location" type="System.Drawing.Point, System.Drawing">
<value>690, 27</value>
<value>696, 27</value>
</data>
<data name="InitialSettingsPane.Size" type="System.Drawing.Size, System.Drawing">
<value>279, 160</value>
<value>282, 160</value>
</data>
<data name="InitialSettingsPane.TabIndex" type="System.Int32, mscorlib">
<value>24</value>
@@ -2185,7 +2206,7 @@ Default: 0.5 (1/2 of a measure)</value>
<value>$this</value>
</data>
<data name="&gt;&gt;InitialSettingsPane.ZOrder" xml:space="preserve">
<value>10</value>
<value>9</value>
</data>
<data name="label29.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -2220,6 +2241,9 @@ Default: 0.5 (1/2 of a measure)</value>
<data name="&gt;&gt;label29.ZOrder" xml:space="preserve">
<value>4</value>
</data>
<data name="MaskSettingsBox.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="MaskCenter.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@@ -2302,10 +2326,10 @@ Default: 0.5 (1/2 of a measure)</value>
<value>2</value>
</data>
<data name="MaskSettingsBox.Location" type="System.Drawing.Point, System.Drawing">
<value>509, 110</value>
<value>514, 119</value>
</data>
<data name="MaskSettingsBox.Size" type="System.Drawing.Size, System.Drawing">
<value>175, 77</value>
<value>176, 84</value>
</data>
<data name="MaskSettingsBox.TabIndex" type="System.Int32, mscorlib">
<value>26</value>
@@ -2323,7 +2347,7 @@ Default: 0.5 (1/2 of a measure)</value>
<value>$this</value>
</data>
<data name="&gt;&gt;MaskSettingsBox.ZOrder" xml:space="preserve">
<value>9</value>
<value>8</value>
</data>
<data name="label18.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -2335,7 +2359,7 @@ Default: 0.5 (1/2 of a measure)</value>
<value>NoControl</value>
</data>
<data name="label18.Location" type="System.Drawing.Point, System.Drawing">
<value>157, 376</value>
<value>145, 7</value>
</data>
<data name="label18.Size" type="System.Drawing.Size, System.Drawing">
<value>188, 16</value>
@@ -2353,10 +2377,10 @@ Default: 0.5 (1/2 of a measure)</value>
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;label18.Parent" xml:space="preserve">
<value>$this</value>
<value>panel1</value>
</data>
<data name="&gt;&gt;label18.ZOrder" xml:space="preserve">
<value>8</value>
<value>0</value>
</data>
<data name="CurrentObjectText.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -2365,7 +2389,7 @@ Default: 0.5 (1/2 of a measure)</value>
<value>Microsoft Sans Serif, 9pt, style=Bold</value>
</data>
<data name="CurrentObjectText.Location" type="System.Drawing.Point, System.Drawing">
<value>348, 377</value>
<value>339, 8</value>
</data>
<data name="CurrentObjectText.Size" type="System.Drawing.Size, System.Drawing">
<value>122, 15</value>
@@ -2383,13 +2407,13 @@ Default: 0.5 (1/2 of a measure)</value>
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;CurrentObjectText.Parent" xml:space="preserve">
<value>$this</value>
<value>panel1</value>
</data>
<data name="&gt;&gt;CurrentObjectText.ZOrder" xml:space="preserve">
<value>7</value>
<value>1</value>
</data>
<data name="PreChartViewBox.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom, Left</value>
<data name="PreChartViewBox.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="GimmickValueLabel.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -2716,7 +2740,7 @@ Default: 0.5 (1/2 of a measure)</value>
<value>10</value>
</data>
<data name="PreChartViewBox.Location" type="System.Drawing.Point, System.Drawing">
<value>6, 516</value>
<value>12, 573</value>
</data>
<data name="PreChartViewBox.Size" type="System.Drawing.Size, System.Drawing">
<value>482, 208</value>
@@ -2737,11 +2761,14 @@ Default: 0.5 (1/2 of a measure)</value>
<value>$this</value>
</data>
<data name="&gt;&gt;PreChartViewBox.ZOrder" xml:space="preserve">
<value>6</value>
<value>7</value>
</data>
<data name="NotesViewBox.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom, Right</value>
</data>
<data name="NotesViewBox.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="EditNoteButton.Location" type="System.Drawing.Point, System.Drawing">
<value>238, 153</value>
</data>
@@ -3337,7 +3364,7 @@ Default: 0.5 (1/2 of a measure)</value>
<value>19</value>
</data>
<data name="NotesViewBox.Location" type="System.Drawing.Point, System.Drawing">
<value>497, 516</value>
<value>508, 573</value>
</data>
<data name="NotesViewBox.Size" type="System.Drawing.Size, System.Drawing">
<value>470, 208</value>
@@ -3358,7 +3385,10 @@ Default: 0.5 (1/2 of a measure)</value>
<value>$this</value>
</data>
<data name="&gt;&gt;NotesViewBox.ZOrder" xml:space="preserve">
<value>5</value>
<value>6</value>
</data>
<data name="MadeByLabel.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom, Right</value>
</data>
<data name="MadeByLabel.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -3367,7 +3397,7 @@ Default: 0.5 (1/2 of a measure)</value>
<value>Javanese Text, 9.75pt, style=Bold</value>
</data>
<data name="MadeByLabel.Location" type="System.Drawing.Point, System.Drawing">
<value>716, 475</value>
<value>725, 541</value>
</data>
<data name="MadeByLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>253, 29</value>
@@ -3388,7 +3418,7 @@ Default: 0.5 (1/2 of a measure)</value>
<value>$this</value>
</data>
<data name="&gt;&gt;MadeByLabel.ZOrder" xml:space="preserve">
<value>4</value>
<value>5</value>
</data>
<metadata name="openFileDialogChart.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>216, 17</value>
@@ -3402,6 +3432,9 @@ Default: 0.5 (1/2 of a measure)</value>
<data name="saveFileDialog1.Filter" xml:space="preserve">
<value>mer files (*.mer)|*.mer|All Files (*.*)|*.*</value>
</data>
<data name="CurrentNoteBox.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="SizeTrackBar.Location" type="System.Drawing.Point, System.Drawing">
<value>137, 45</value>
</data>
@@ -3445,10 +3478,10 @@ Default: 0.5 (1/2 of a measure)</value>
<value>1</value>
</data>
<data name="CurrentNoteBox.Location" type="System.Drawing.Point, System.Drawing">
<value>351, 193</value>
<value>351, 209</value>
</data>
<data name="CurrentNoteBox.Size" type="System.Drawing.Size, System.Drawing">
<value>333, 126</value>
<value>339, 133</value>
</data>
<data name="CurrentNoteBox.TabIndex" type="System.Int32, mscorlib">
<value>31</value>
@@ -3466,7 +3499,7 @@ Default: 0.5 (1/2 of a measure)</value>
<value>$this</value>
</data>
<data name="&gt;&gt;CurrentNoteBox.ZOrder" xml:space="preserve">
<value>3</value>
<value>4</value>
</data>
<metadata name="fileSystemWatcher1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>491, 20</value>
@@ -3475,13 +3508,49 @@ Default: 0.5 (1/2 of a measure)</value>
<value>True</value>
</metadata>
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
<value>6, 13</value>
<value>96, 96</value>
</data>
<data name="$this.AutoScroll" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="$this.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="$this.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
<value>GrowAndShrink</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>981, 736</value>
<value>990, 793</value>
</data>
<data name="panel1.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="panel1.Location" type="System.Drawing.Point, System.Drawing">
<value>12, 403</value>
</data>
<data name="panel1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 0, 0, 0</value>
</data>
<data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
<value>678, 33</value>
</data>
<data name="panel1.TabIndex" type="System.Int32, mscorlib">
<value>39</value>
</data>
<data name="&gt;&gt;panel1.Name" xml:space="preserve">
<value>panel1</value>
</data>
<data name="&gt;&gt;panel1.Type" xml:space="preserve">
<value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;panel1.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;panel1.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="SongPlaybackBox.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="VolumeLabel.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -3631,10 +3700,10 @@ Default: 0.5 (1/2 of a measure)</value>
<value>6</value>
</data>
<data name="SongPlaybackBox.Location" type="System.Drawing.Point, System.Drawing">
<value>13, 395</value>
<value>12, 439</value>
</data>
<data name="SongPlaybackBox.Size" type="System.Drawing.Size, System.Drawing">
<value>572, 115</value>
<value>572, 128</value>
</data>
<data name="SongPlaybackBox.TabIndex" type="System.Int32, mscorlib">
<value>38</value>
@@ -3652,13 +3721,16 @@ Default: 0.5 (1/2 of a measure)</value>
<value>$this</value>
</data>
<data name="&gt;&gt;SongPlaybackBox.ZOrder" xml:space="preserve">
<value>0</value>
<value>1</value>
</data>
<data name="VisualSettingsBox.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="VisualSettingsBox.Location" type="System.Drawing.Point, System.Drawing">
<value>591, 395</value>
<value>590, 439</value>
</data>
<data name="VisualSettingsBox.Size" type="System.Drawing.Size, System.Drawing">
<value>93, 62</value>
<value>100, 71</value>
</data>
<data name="VisualSettingsBox.TabIndex" type="System.Int32, mscorlib">
<value>33</value>
@@ -3676,16 +3748,19 @@ Default: 0.5 (1/2 of a measure)</value>
<value>$this</value>
</data>
<data name="&gt;&gt;VisualSettingsBox.ZOrder" xml:space="preserve">
<value>1</value>
<value>2</value>
</data>
<data name="CirclePanel.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Right</value>
</data>
<data name="CirclePanel.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="CirclePanel.Location" type="System.Drawing.Point, System.Drawing">
<value>690, 193</value>
<value>696, 193</value>
</data>
<data name="CirclePanel.Size" type="System.Drawing.Size, System.Drawing">
<value>279, 279</value>
<value>282, 282</value>
</data>
<data name="CirclePanel.TabIndex" type="System.Int32, mscorlib">
<value>32</value>
@@ -3700,7 +3775,7 @@ Default: 0.5 (1/2 of a measure)</value>
<value>$this</value>
</data>
<data name="&gt;&gt;CirclePanel.ZOrder" xml:space="preserve">
<value>2</value>
<value>3</value>
</data>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
@@ -4131,6 +4206,12 @@ Default: 0.5 (1/2 of a measure)</value>
<data name="&gt;&gt;backgroundWorker1.Type" xml:space="preserve">
<value>System.ComponentModel.BackgroundWorker, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;backgroundWorker2.Name" xml:space="preserve">
<value>backgroundWorker2</value>
</data>
<data name="&gt;&gt;backgroundWorker2.Type" xml:space="preserve">
<value>System.ComponentModel.BackgroundWorker, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>MyForm</value>
</data>
@@ -4152,4 +4233,7 @@ Default: 0.5 (1/2 of a measure)</value>
<metadata name="backgroundWorker1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 59</value>
</metadata>
<metadata name="backgroundWorker2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>181, 59</value>
</metadata>
</root>