mirror of
https://github.com/ShareX/ShareX.git
synced 2024-08-18 11:42:01 +12:00
Few changes in screen recorder region
This commit is contained in:
parent
2d25429cef
commit
c234c61045
3 changed files with 15 additions and 14 deletions
6
ShareX/Forms/ScreenRegionForm.Designer.cs
generated
6
ShareX/Forms/ScreenRegionForm.Designer.cs
generated
|
@ -30,10 +30,10 @@ private void InitializeComponent()
|
||||||
{
|
{
|
||||||
this.components = new System.ComponentModel.Container();
|
this.components = new System.ComponentModel.Container();
|
||||||
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ScreenRegionForm));
|
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ScreenRegionForm));
|
||||||
this.btnStop = new HelpersLib.BlackStyleButton();
|
this.btnStop = new ShareX.HelpersLib.BlackStyleButton();
|
||||||
this.lblTimer = new HelpersLib.BlackStyleLabel();
|
this.lblTimer = new ShareX.HelpersLib.BlackStyleLabel();
|
||||||
this.timerRefresh = new System.Windows.Forms.Timer(this.components);
|
this.timerRefresh = new System.Windows.Forms.Timer(this.components);
|
||||||
this.btnAbort = new HelpersLib.BlackStyleButton();
|
this.btnAbort = new ShareX.HelpersLib.BlackStyleButton();
|
||||||
this.pInfo = new System.Windows.Forms.Panel();
|
this.pInfo = new System.Windows.Forms.Panel();
|
||||||
this.pInfo.SuspendLayout();
|
this.pInfo.SuspendLayout();
|
||||||
this.SuspendLayout();
|
this.SuspendLayout();
|
||||||
|
|
|
@ -57,18 +57,19 @@ public ScreenRegionForm(Rectangle regionRectangle)
|
||||||
|
|
||||||
Location = borderRectangle.Location;
|
Location = borderRectangle.Location;
|
||||||
int windowWidth = Math.Max(borderRectangle.Width, pInfo.Width);
|
int windowWidth = Math.Max(borderRectangle.Width, pInfo.Width);
|
||||||
Size = new Size(windowWidth, borderRectangle.Height + pInfo.Height);
|
Size = new Size(windowWidth, borderRectangle.Height + pInfo.Height + 1);
|
||||||
pInfo.Location = new Point(0, borderRectangle.Height);
|
pInfo.Location = new Point(0, borderRectangle.Height + 1);
|
||||||
|
|
||||||
Region region = new Region(ClientRectangle);
|
Region region = new Region(ClientRectangle);
|
||||||
region.Exclude(borderRectangle0Based.Offset(-1));
|
region.Exclude(borderRectangle0Based.Offset(-1));
|
||||||
|
region.Exclude(new Rectangle(0, borderRectangle.Height, windowWidth, 1));
|
||||||
if (borderRectangle.Width < pInfo.Width)
|
if (borderRectangle.Width < pInfo.Width)
|
||||||
{
|
{
|
||||||
region.Exclude(new Rectangle(borderRectangle.Width, 0, pInfo.Width - borderRectangle.Width, borderRectangle.Height));
|
region.Exclude(new Rectangle(borderRectangle.Width, 0, pInfo.Width - borderRectangle.Width, borderRectangle.Height));
|
||||||
}
|
}
|
||||||
else
|
else if (borderRectangle.Width > pInfo.Width)
|
||||||
{
|
{
|
||||||
region.Exclude(new Rectangle(pInfo.Width, borderRectangle.Height, borderRectangle.Width - pInfo.Width, pInfo.Height));
|
region.Exclude(new Rectangle(pInfo.Width, borderRectangle.Height + 1, borderRectangle.Width - pInfo.Width, pInfo.Height));
|
||||||
}
|
}
|
||||||
Region = region;
|
Region = region;
|
||||||
|
|
||||||
|
|
|
@ -122,7 +122,7 @@
|
||||||
<value>Arial, 12pt</value>
|
<value>Arial, 12pt</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="btnStop.Location" type="System.Drawing.Point, System.Drawing">
|
<data name="btnStop.Location" type="System.Drawing.Point, System.Drawing">
|
||||||
<value>79, 0</value>
|
<value>0, 0</value>
|
||||||
</data>
|
</data>
|
||||||
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||||
<data name="btnStop.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
|
<data name="btnStop.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
|
||||||
|
@ -142,7 +142,7 @@
|
||||||
<value>btnStop</value>
|
<value>btnStop</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>btnStop.Type" xml:space="preserve">
|
<data name=">>btnStop.Type" xml:space="preserve">
|
||||||
<value>HelpersLib.BlackStyleButton, HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
|
<value>ShareX.HelpersLib.BlackStyleButton, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>btnStop.Parent" xml:space="preserve">
|
<data name=">>btnStop.Parent" xml:space="preserve">
|
||||||
<value>pInfo</value>
|
<value>pInfo</value>
|
||||||
|
@ -154,7 +154,7 @@
|
||||||
<value>Arial, 12pt</value>
|
<value>Arial, 12pt</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="lblTimer.Location" type="System.Drawing.Point, System.Drawing">
|
<data name="lblTimer.Location" type="System.Drawing.Point, System.Drawing">
|
||||||
<value>0, 0</value>
|
<value>190, 0</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="lblTimer.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
|
<data name="lblTimer.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
|
||||||
<value>0, 0, 0, 0</value>
|
<value>0, 0, 0, 0</value>
|
||||||
|
@ -167,12 +167,12 @@
|
||||||
</data>
|
</data>
|
||||||
<data name="lblTimer.Text" xml:space="preserve">
|
<data name="lblTimer.Text" xml:space="preserve">
|
||||||
<value>00:00:00</value>
|
<value>00:00:00</value>
|
||||||
<comment>@Invariant</comment></data>
|
</data>
|
||||||
<data name=">>lblTimer.Name" xml:space="preserve">
|
<data name=">>lblTimer.Name" xml:space="preserve">
|
||||||
<value>lblTimer</value>
|
<value>lblTimer</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>lblTimer.Type" xml:space="preserve">
|
<data name=">>lblTimer.Type" xml:space="preserve">
|
||||||
<value>HelpersLib.BlackStyleLabel, HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
|
<value>ShareX.HelpersLib.BlackStyleLabel, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>lblTimer.Parent" xml:space="preserve">
|
<data name=">>lblTimer.Parent" xml:space="preserve">
|
||||||
<value>pInfo</value>
|
<value>pInfo</value>
|
||||||
|
@ -187,7 +187,7 @@
|
||||||
<value>Arial, 12pt</value>
|
<value>Arial, 12pt</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="btnAbort.Location" type="System.Drawing.Point, System.Drawing">
|
<data name="btnAbort.Location" type="System.Drawing.Point, System.Drawing">
|
||||||
<value>174, 0</value>
|
<value>95, 0</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="btnAbort.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
|
<data name="btnAbort.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
|
||||||
<value>0, 0, 0, 0</value>
|
<value>0, 0, 0, 0</value>
|
||||||
|
@ -205,7 +205,7 @@
|
||||||
<value>btnAbort</value>
|
<value>btnAbort</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>btnAbort.Type" xml:space="preserve">
|
<data name=">>btnAbort.Type" xml:space="preserve">
|
||||||
<value>HelpersLib.BlackStyleButton, HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
|
<value>ShareX.HelpersLib.BlackStyleButton, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>btnAbort.Parent" xml:space="preserve">
|
<data name=">>btnAbort.Parent" xml:space="preserve">
|
||||||
<value>pInfo</value>
|
<value>pInfo</value>
|
||||||
|
|
Loading…
Reference in a new issue