2.4.0.1 - Region Select fix for SourceForge ticket 97 by Sukij Dansai…

…kul. Reverted changes to not use Canvas to see if it works again as before.
gavinkendall · Feb 2, 2022 · f9568a2 · f9568a2
1 parent 2b7cc59
commit f9568a2
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 25 deletions.
diff --git a/AutoScreenCaptureSetup/AutoScreenCaptureSetup.vdproj b/AutoScreenCaptureSetup/AutoScreenCaptureSetup.vdproj
@@ -25,12 +25,6 @@
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
-        "Entry"
-        {
-        "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_9ACC9C115A4F4BCABA938B9FF9F2199F"
-        "MsmSig" = "8:_UNDEFINED"
-        }
     }
     "Configurations"
     {
@@ -133,11 +127,6 @@
             "AssemblyAsmDisplayName" = "8:autoscreen, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_9ACC9C115A4F4BCABA938B9FF9F2199F"
-                    {
-                    "Name" = "8:autoscreen.exe"
-                    "Attributes" = "3:512"
-                    }
                 }
             "SourcePath" = "8:..\\bin\\Release\\autoscreen.exe"
             "TargetName" = "8:"
@@ -244,15 +233,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Auto Screen Capture"
-        "ProductCode" = "8:{A0484066-38B3-4818-B07A-6DE7A704637C}"
-        "PackageCode" = "8:{F8513E76-278E-4CBC-BD83-2471AA433B1D}"
+        "ProductCode" = "8:{EA10CD93-8618-4F7F-83A0-0BCF6D8DD79A}"
+        "PackageCode" = "8:{6311295D-053F-4AC6-8CF5-58AFC0C04F61}"
         "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.00"
+        "ProductVersion" = "8:2.4.01"
         "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.0")]
-[assembly: AssemblyFileVersion("2.4.0.0")]
+[assembly: AssemblyVersion("2.4.0.1")]
+[assembly: AssemblyFileVersion("2.4.0.1")]
 [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.0"/>
+    version="2.4.0.1"/>
   <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
@@ -98,20 +98,35 @@ public void LoadCanvas(bool sendToClipboard)
         {
             _sendToClipboard = sendToClipboard;
 
-            Rectangle canvas = SystemInformation.VirtualScreen;
+            Top = 0;
+            Left = 0;
 
-            WindowState = FormWindowState.Normal;
+            int width = 0;
+            int height = 0;
+
+            foreach (System.Windows.Forms.Screen windowsScreen in System.Windows.Forms.Screen.AllScreens)
+            {
+                if (windowsScreen.Bounds.X < Left)
+                {
+                    Left = windowsScreen.Bounds.X;
+                }
 
-            Top = canvas.X;
-            Left = canvas.Y;
-            Width = canvas.Width;
-            Height = canvas.Height;
+                if (windowsScreen.Bounds.Y < Top)
+                {
+                    Top = windowsScreen.Bounds.Y;
+                }
+
+                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))
             {

diff --git a/settings/Settings.cs b/settings/Settings.cs
@@ -248,6 +248,7 @@ public void Load(FileSystem fileSystem)
             _versionCollection.Add(new Version(CODENAME_BOOMBAYAH, "2.3.6.8")); // Fixed bug with "the handle is invalid" to prevent application from crashing when Windows is locked. The check on the invalid handle was accidentally removed in 2.3.4.1 but has now been restored.
             _versionCollection.Add(new Version(CODENAME_BOOMBAYAH, "2.3.6.9")); // Maybe fixed the bug with region select not working on multiple displays. Maybe. I haven't had multiple displays to test this properly for myself due to working from a laptop since March 2020.
             _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"
 
             Application = new SettingCollection()
             {