From c234c61045d5b8e5a5fab5686676c8acc7ac6e61 Mon Sep 17 00:00:00 2001 From: Jaex Date: Fri, 13 Feb 2015 09:34:41 +0200 Subject: [PATCH] Few changes in screen recorder region --- ShareX/Forms/ScreenRegionForm.Designer.cs | 6 +++--- ShareX/Forms/ScreenRegionForm.cs | 9 +++++---- ShareX/Forms/ScreenRegionForm.resx | 14 +++++++------- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/ShareX/Forms/ScreenRegionForm.Designer.cs b/ShareX/Forms/ScreenRegionForm.Designer.cs index 055a5724e..7cd3f6ecf 100644 --- a/ShareX/Forms/ScreenRegionForm.Designer.cs +++ b/ShareX/Forms/ScreenRegionForm.Designer.cs @@ -30,10 +30,10 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ScreenRegionForm)); - this.btnStop = new HelpersLib.BlackStyleButton(); - this.lblTimer = new HelpersLib.BlackStyleLabel(); + this.btnStop = new ShareX.HelpersLib.BlackStyleButton(); + this.lblTimer = new ShareX.HelpersLib.BlackStyleLabel(); 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.SuspendLayout(); this.SuspendLayout(); diff --git a/ShareX/Forms/ScreenRegionForm.cs b/ShareX/Forms/ScreenRegionForm.cs index d98a0f304..aa2e37955 100644 --- a/ShareX/Forms/ScreenRegionForm.cs +++ b/ShareX/Forms/ScreenRegionForm.cs @@ -57,18 +57,19 @@ public ScreenRegionForm(Rectangle regionRectangle) Location = borderRectangle.Location; int windowWidth = Math.Max(borderRectangle.Width, pInfo.Width); - Size = new Size(windowWidth, borderRectangle.Height + pInfo.Height); - pInfo.Location = new Point(0, borderRectangle.Height); + Size = new Size(windowWidth, borderRectangle.Height + pInfo.Height + 1); + pInfo.Location = new Point(0, borderRectangle.Height + 1); Region region = new Region(ClientRectangle); region.Exclude(borderRectangle0Based.Offset(-1)); + region.Exclude(new Rectangle(0, borderRectangle.Height, windowWidth, 1)); if (borderRectangle.Width < pInfo.Width) { 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; diff --git a/ShareX/Forms/ScreenRegionForm.resx b/ShareX/Forms/ScreenRegionForm.resx index a9556564a..79f7cbe37 100644 --- a/ShareX/Forms/ScreenRegionForm.resx +++ b/ShareX/Forms/ScreenRegionForm.resx @@ -122,7 +122,7 @@ Arial, 12pt - 79, 0 + 0, 0 @@ -142,7 +142,7 @@ btnStop - HelpersLib.BlackStyleButton, HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + ShareX.HelpersLib.BlackStyleButton, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null pInfo @@ -154,7 +154,7 @@ Arial, 12pt - 0, 0 + 190, 0 0, 0, 0, 0 @@ -167,12 +167,12 @@ 00:00:00 - @Invariant + lblTimer - HelpersLib.BlackStyleLabel, HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + ShareX.HelpersLib.BlackStyleLabel, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null pInfo @@ -187,7 +187,7 @@ Arial, 12pt - 174, 0 + 95, 0 0, 0, 0, 0 @@ -205,7 +205,7 @@ btnAbort - HelpersLib.BlackStyleButton, HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + ShareX.HelpersLib.BlackStyleButton, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null pInfo