Skip to content

Commit f9568a2

Browse files
committed
2.4.0.1 - Region Select fix for SourceForge ticket 97 by Sukij Dansaikul. Reverted changes to not use Canvas to see if it works again as before.
1 parent 2b7cc59 commit f9568a2

File tree

6 files changed

+30
-25
lines changed

6 files changed

+30
-25
lines changed

AutoScreenCaptureSetup/AutoScreenCaptureSetup.vdproj

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,6 @@
2525
"OwnerKey" = "8:_UNDEFINED"
2626
"MsmSig" = "8:_UNDEFINED"
2727
}
28-
"Entry"
29-
{
30-
"MsmKey" = "8:_UNDEFINED"
31-
"OwnerKey" = "8:_9ACC9C115A4F4BCABA938B9FF9F2199F"
32-
"MsmSig" = "8:_UNDEFINED"
33-
}
3428
}
3529
"Configurations"
3630
{
@@ -133,11 +127,6 @@
133127
"AssemblyAsmDisplayName" = "8:autoscreen, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL"
134128
"ScatterAssemblies"
135129
{
136-
"_9ACC9C115A4F4BCABA938B9FF9F2199F"
137-
{
138-
"Name" = "8:autoscreen.exe"
139-
"Attributes" = "3:512"
140-
}
141130
}
142131
"SourcePath" = "8:..\\bin\\Release\\autoscreen.exe"
143132
"TargetName" = "8:"
@@ -244,15 +233,15 @@
244233
{
245234
"Name" = "8:Microsoft Visual Studio"
246235
"ProductName" = "8:Auto Screen Capture"
247-
"ProductCode" = "8:{A0484066-38B3-4818-B07A-6DE7A704637C}"
248-
"PackageCode" = "8:{F8513E76-278E-4CBC-BD83-2471AA433B1D}"
236+
"ProductCode" = "8:{EA10CD93-8618-4F7F-83A0-0BCF6D8DD79A}"
237+
"PackageCode" = "8:{6311295D-053F-4AC6-8CF5-58AFC0C04F61}"
249238
"UpgradeCode" = "8:{6B29B7BC-0101-4495-B28C-26B6D3CDCC02}"
250239
"AspNetVersion" = "8:4.0.30319.0"
251240
"RestartWWWService" = "11:FALSE"
252241
"RemovePreviousVersions" = "11:TRUE"
253242
"DetectNewerInstalledVersion" = "11:TRUE"
254243
"InstallAllUsers" = "11:FALSE"
255-
"ProductVersion" = "8:2.4.00"
244+
"ProductVersion" = "8:2.4.01"
256245
"Manufacturer" = "8:Gavin Kendall"
257246
"ARPHELPTELEPHONE" = "8:"
258247
"ARPHELPLINK" = "8:https://sourceforge.net/p/autoscreen/tickets/"

Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("2.4.0.0")]
36-
[assembly: AssemblyFileVersion("2.4.0.0")]
35+
[assembly: AssemblyVersion("2.4.0.1")]
36+
[assembly: AssemblyFileVersion("2.4.0.1")]
3737
[assembly: NeutralResourcesLanguageAttribute("en-CA")]

app.manifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<assemblyIdentity
44
type="win32"
55
name="GavinKendall.AutoScreenCapture"
6-
version="2.4.0.0"/>
6+
version="2.4.0.1"/>
77
<asmv3:application>
88
<asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
99
<dpiAware>True/PM</dpiAware>

interface/about/FormAbout.Designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

interface/region_select/FormRegionSelectWithMouse.cs

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -98,20 +98,35 @@ public void LoadCanvas(bool sendToClipboard)
9898
{
9999
_sendToClipboard = sendToClipboard;
100100

101-
Rectangle canvas = SystemInformation.VirtualScreen;
101+
Top = 0;
102+
Left = 0;
102103

103-
WindowState = FormWindowState.Normal;
104+
int width = 0;
105+
int height = 0;
106+
107+
foreach (System.Windows.Forms.Screen windowsScreen in System.Windows.Forms.Screen.AllScreens)
108+
{
109+
if (windowsScreen.Bounds.X < Left)
110+
{
111+
Left = windowsScreen.Bounds.X;
112+
}
104113

105-
Top = canvas.X;
106-
Left = canvas.Y;
107-
Width = canvas.Width;
108-
Height = canvas.Height;
114+
if (windowsScreen.Bounds.Y < Top)
115+
{
116+
Top = windowsScreen.Bounds.Y;
117+
}
118+
119+
width += windowsScreen.Bounds.Width;
120+
height += windowsScreen.Bounds.Height;
121+
}
109122

110123
WindowState = FormWindowState.Normal;
124+
Width = width;
125+
Height = height;
111126

112127
Hide();
113128

114-
_bitmapSource = new Bitmap(Width, Height);
129+
_bitmapSource = new Bitmap(width, height);
115130

116131
using (Graphics graphics = Graphics.FromImage(_bitmapSource))
117132
{

settings/Settings.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,7 @@ public void Load(FileSystem fileSystem)
248248
_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.
249249
_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.
250250
_versionCollection.Add(new Version(CODENAME_BOOMBAYAH, "2.3.7.0")); // Attempting to fix bug with region select not working on multiple displays.
251+
_versionCollection.Add(new Version(CODENAME_BOOMBAYAH, "2.4.0.0")); // Release of 2.4 "Blade"
251252

252253
Application = new SettingCollection()
253254
{

0 commit comments

Comments
 (0)