2.4.0.3 - Region Select fix.

gavinkendall · Feb 4, 2022 · 980bbae · 980bbae
1 parent 916db80
commit 980bbae
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 15 deletions.
diff --git a/AutoScreenCaptureSetup/AutoScreenCaptureSetup.vdproj b/AutoScreenCaptureSetup/AutoScreenCaptureSetup.vdproj
@@ -233,15 +233,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Auto Screen Capture"
-        "ProductCode" = "8:{D06FA6DB-6096-402D-9416-E5FE5AAECC07}"
-        "PackageCode" = "8:{3039136F-1503-4E94-AEDD-7237CB6CF1F2}"
+        "ProductCode" = "8:{43F45970-584D-4C76-ADCC-610AB994D42D}"
+        "PackageCode" = "8:{7FF98C6C-11AC-4809-9EC7-4AC126036611}"
         "UpgradeCode" = "8:{6B29B7BC-0101-4495-B28C-26B6D3CDCC02}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:2.4.02"
+        "ProductVersion" = "8:2.4.03"
         "Manufacturer" = "8:Gavin Kendall"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:https://sourceforge.net/p/autoscreen/tickets/"

diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -32,6 +32,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.4.0.2")]
-[assembly: AssemblyFileVersion("2.4.0.2")]
+[assembly: AssemblyVersion("2.4.0.3")]
+[assembly: AssemblyFileVersion("2.4.0.3")]
 [assembly: NeutralResourcesLanguageAttribute("en-CA")]
diff --git a/app.manifest b/app.manifest
@@ -3,7 +3,7 @@
   <assemblyIdentity
     type="win32"
     name="GavinKendall.AutoScreenCapture"
-    version="2.4.0.2"/>
+    version="2.4.0.3"/>
   <asmv3:application>
     <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
       <dpiAware>True/PM</dpiAware>

diff --git a/interface/about/FormAbout.Designer.cs b/interface/about/FormAbout.Designer.cs
diff --git a/interface/region_select/FormRegionSelectWithMouse.cs b/interface/region_select/FormRegionSelectWithMouse.cs
@@ -101,8 +101,8 @@ public void LoadCanvas(bool sendToClipboard)
             Top = 0;
             Left = 0;
 
-            int width = 0;
-            int height = 0;
+            Width = 0;
+            Height = 0;
 
             foreach (System.Windows.Forms.Screen windowsScreen in System.Windows.Forms.Screen.AllScreens)
             {
@@ -116,21 +116,19 @@ public void LoadCanvas(bool sendToClipboard)
                     Top = windowsScreen.Bounds.Y;
                 }
 
-                width += windowsScreen.Bounds.Width;
-                height += windowsScreen.Bounds.Height;
+                Width += windowsScreen.Bounds.Width;
+                Height += windowsScreen.Bounds.Height;
             }
 
             WindowState = FormWindowState.Normal;
-            Width = width;
-            Height = height;
 
             Hide();
 
-            _bitmapSource = new Bitmap(width, height);
+            _bitmapSource = new Bitmap(Width, Height);
 
             using (Graphics graphics = Graphics.FromImage(_bitmapSource))
             {
-                graphics.CopyFromScreen(0, 0, 0, 0, _bitmapSource.Size);
+                graphics.CopyFromScreen(Top, Left, Top, Left, _bitmapSource.Size);
 
                 using (MemoryStream s = new MemoryStream())
                 {

diff --git a/settings/Settings.cs b/settings/Settings.cs
@@ -250,6 +250,7 @@ public void Load(FileSystem fileSystem)
             _versionCollection.Add(new Version(CODENAME_BOOMBAYAH, "2.3.7.0")); // Attempting to fix bug with region select not working on multiple displays.
             _versionCollection.Add(new Version(CODENAME_BOOMBAYAH, "2.4.0.0")); // Release of 2.4 "Blade"
             _versionCollection.Add(new Version(CODENAME_BOOMBAYAH, "2.4.0.1")); // Region Select fix.
+            _versionCollection.Add(new Version(CODENAME_BOOMBAYAH, "2.4.0.2")); // Region Select fix.
 
             Application = new SettingCollection()
             {