Merge branch 'ShareX:develop' into develop

This commit is contained in:
Eric Tetz 2022-02-09 15:42:49 -07:00 committed by GitHub
commit 683650a312
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions

View file

@ -57,7 +57,6 @@ private void InitializeComponent()
// TextUploadForm
//
resources.ApplyResources(this, "$this");
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.CancelButton = this.btnCancel;
this.Controls.Add(this.btnCancel);

View file

@ -132,6 +132,9 @@
<data name="txtContent.Multiline" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="txtContent.ScrollBars" type="System.Windows.Forms.ScrollBars, System.Windows.Forms">
<value>Both</value>
</data>
<data name="txtContent.Size" type="System.Drawing.Size, System.Drawing">
<value>616, 472</value>
</data>
@ -208,7 +211,7 @@
<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.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>632, 520</value>