* Fixed bug in Get-Area button in Image/Pixel Search window.

Pulover · Jan 6, 2021 · c6e2a1c · c6e2a1c
1 parent 4b71fe8
commit c6e2a1c
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 27 deletions.
diff --git a/BuildFiles.ahk b/BuildFiles.ahk
@@ -24,7 +24,7 @@ Script =
 #define PmcVersion "%PMCVer%"
 #define PmcCompany "Rodolfo U. Batista"
 #define PmcURL "https://www.macrocreator.com"
-#define PmcCopyright "Copyright (C) 2012-2020 Rodolfo U. Batista"
+#define PmcCopyright "Copyright (C) 2012-2021 Rodolfo U. Batista"
 #define PmcExeName "MacroCreator.exe"
 #define PmcExt "pmc"
 #define WorkDir "%A_ScriptDir%"

diff --git a/Documentation/About.md b/Documentation/About.md
@@ -5,10 +5,10 @@
 [Forum](https://www.autohotkey.com/boards/viewforum.php?f=63)  
 
 Author: Pulover \[Rodolfo U. Batista\]  
-Copyright © 2012-2020 Rodolfo U. Batista  
+Copyright © 2012-2021 Rodolfo U. Batista  
 
-Version: 5.3.8  
-Release Date: December, 2020  
+Version: 5.3.9  
+Release Date: January, 2021  
 AutoHotkey Version: 1.1.32.00  
 
 Software License: [GNU General Public License](License.html)  
@@ -38,8 +38,11 @@ chosen1ft for suggestions and testing.
 
 # Change Log
 
+## Version 5.3.9
+* Fixed bug in Get-Area button in Image/Pixel Search window.
+
 ## Version 5.3.8
-* Fixing bug with named operators.
+* Fixed bug with named operators.
 * Fixed scroll bug during operations with groups enabled.
 
 ## Version 5.3.7

diff --git a/Documentation/License.html b/Documentation/License.html
@@ -9,7 +9,7 @@
 <body>
 <h1 id="software-license">Software License</h1>
 <h2 id="license-for-pulovers-macro-creator">License for Pulover's Macro Creator</h2>
-<p>Copyright 2012-2020 by Rodolfo U. Batista<br/></p>
+<p>Copyright 2012-2021 by Rodolfo U. Batista<br/></p>
 <pre class="NoIndent">I specifically grant Michael Wong (user guest3456 on AHK forums) use of this code
 under the terms of the UNLICENSE here: &lt;http://unlicense.org/UNLICENSE&gt;
 For everyone else, the GPL below applies.</pre>

diff --git a/Documentation/License.md b/Documentation/License.md
@@ -2,7 +2,7 @@
 
 ## License for Pulover's Macro Creator
 
-Copyright 2012-2020 by Rodolfo U. Batista  
+Copyright 2012-2021 by Rodolfo U. Batista  
 
 > I specifically grant Michael Wong (user guest3456 on AHK forums) use of this code
 > under the terms of the UNLICENSE here: <http://unlicense.org/UNLICENSE>

diff --git a/Documentation/MacroCreator_Help.ahk b/Documentation/MacroCreator_Help.ahk
@@ -1,12 +1,12 @@
 /*!
 	Library: Pulover's Macro Creator
 		
-		# Version: 5.3.8
+		# Version: 5.3.9
 		[www.macrocreator.com](https://www.macrocreator.com)  
 		[Forum](https://www.autohotkey.com/boards/viewforum.php?f=63)
 		
 		Author: Pulover [Rodolfo U. Batista]  
-		©2012-2020 Rodolfo U. Batista
+		©2012-2021 Rodolfo U. Batista
 		
 		Software License: [GNU General Public License](License.html)
 		

diff --git a/LIB/Hotkeys.ahk b/LIB/Hotkeys.ahk
@@ -209,56 +209,60 @@ MButton::GoSub, DrawStart
 ^Up::
 ^NumpadUp::
 MoveRectangle("y", 0, LineW)
-iX := "", iY := ""
+; iX := "", iY := ""
+iY--
 GoSub, ShowAreaTip
 return
 
 +Up::
 +NumpadUp::
 MoveRectangle("h", 0, LineW)
-iX := "", iY := ""
+; iX := "", iY := ""
 GoSub, ShowAreaTip
 return
 
 ^Down::
 ^NumpadDown::
 MoveRectangle("y", 1, LineW)
-iX := "", iY := ""
+; iX := "", iY := ""
+iY++
 GoSub, ShowAreaTip
 return
 
 +Down::
 +NumpadDown::
 MoveRectangle("h", 1, LineW)
-iX := "", iY := ""
+; iX := "", iY := ""
 GoSub, ShowAreaTip
 return
 
 ^Left::
 ^NumpadLeft::
 MoveRectangle("x", 0, LineW)
-iX := "", iY := ""
+; iX := "", iY := ""
+iX--
 GoSub, ShowAreaTip
 return
 
 +Left::
 +NumpadLeft::
 MoveRectangle("w", 0, LineW)
-iX := "", iY := ""
+; iX := "", iY := ""
 GoSub, ShowAreaTip
 return
 
 ^Right::
 ^NumpadRight::
 MoveRectangle("x", 1, LineW)
-iX := "", iY := ""
+; iX := "", iY := ""
+iX++
 GoSub, ShowAreaTip
 return
 
 +Right::
 +NumpadRight::
 MoveRectangle("w", 1, LineW)
-iX := "", iY := ""
+; iX := "", iY := ""
 GoSub, ShowAreaTip
 return
 

diff --git a/LIB/Internal.ahk b/LIB/Internal.ahk
@@ -479,7 +479,7 @@ SCI_NOTIFY(wParam, lParam, msg, hwnd, sciObj)
 
 MarkArea(LineW)
 {
-	global c_Lang004, c_Lang059, d_Lang057
+	global c_Lang004, c_Lang059, d_Lang057, AreaSet
 
 	MouseGetPos,,, id, control
 	ControlGetPos, cX, cY, cW, cH, %control%, ahk_id %id%
@@ -519,10 +519,13 @@ MarkArea(LineW)
 	WinSet, Region, 0-0 %W1%-0 %W1%-%H1% 0-%H1% 0-0  %LineW%-%LineW% %W2%-%LineW% %W2%-%H2% %LineW%-%H2% %LineW%-%LineW%
 	Gui, 20:Show, NA x%X1% y%Y1% w%W1% h%H1%
 	WinMove, , , X1, Y1, W1, H1
+	AreaSet := True
 }
 
 MoveRectangle(o, p, LineW)
 {
+	global AreaSet
+
 	Gui, 20:+LastFound
 	WinGetPos, wX, wY, wW, wH
 	w%o% := (p) ? w%o%+1 : w%o%-1
@@ -531,6 +534,7 @@ MoveRectangle(o, p, LineW)
 ,	W2 := W1 - LineW, H2 := H1 - LineW
 	WinSet, Region, 0-0 %W1%-0 %W1%-%H1% 0-%H1% 0-0  %LineW%-%LineW% %W2%-%LineW% %W2%-%H2% %LineW%-%H2% %LineW%-%LineW%
 	WinMove,,, %wX%, %wY%, %wW%, %wH%
+	AreaSet := True
 }
 
 Screenshot(outfile, screen)

diff --git a/MacroCreator.ahk b/MacroCreator.ahk
@@ -5,10 +5,10 @@
 ; Author: Pulover [Rodolfo U. Batista]
 ; Home: https://www.macrocreator.com
 ; Forum: https://www.autohotkey.com/boards/viewforum.php?f=63
-; Version: 5.3.8
-; Release Date: December, 2020
+; Version: 5.3.9
+; Release Date: January, 2021
 ; AutoHotkey Version: 1.1.32.00
-; Copyright © 2012-2020 Rodolfo U. Batista
+; Copyright © 2012-2021 Rodolfo U. Batista
 ; I specifically grant Michael Wong (user guest3456 on AHK forums) use of this code
 ; under the terms of the UNLICENSE here: <https://unlicense.org/UNLICENSE>
 ; For everyone else, the GPL below applies.
@@ -77,8 +77,8 @@ https://www.macrocreator.com/project/
 ; Compiler Settings
 ;@Ahk2Exe-SetName Pulover's Macro Creator
 ;@Ahk2Exe-SetDescription Pulover's Macro Creator
-;@Ahk2Exe-SetVersion 5.3.8
-;@Ahk2Exe-SetCopyright Copyright © 2012-2020 Rodolfo U. Batista
+;@Ahk2Exe-SetVersion 5.3.9
+;@Ahk2Exe-SetCopyright Copyright © 2012-2021 Rodolfo U. Batista
 ;@Ahk2Exe-SetOrigFilename MacroCreator.exe
 
 ; AutoHotkey settings:
@@ -144,7 +144,7 @@ Loop
 		break
 }
 
-CurrentVersion := "5.3.8", ReleaseDate := "December, 2020"
+CurrentVersion := "5.3.9", ReleaseDate := "January, 2021"
 
 ;##### Ini File Read #####
 
@@ -4238,7 +4238,7 @@ Gui, 34:Add, Link,, <a href="https://www.macrocreator.com">www.macrocreator.com<
 Gui, 34:Add, Text,, Author: Pulover [Rodolfo U. Batista]
 Gui, 34:Add, Text, -Wrap R1 y+0,
 (
-Copyright © 2012-2020 Rodolfo U. Batista
+Copyright © 2012-2021 Rodolfo U. Batista
 
 Version: %CurrentVersion% (%OsBit%)
 Release Date: %ReleaseDate%
@@ -5467,6 +5467,7 @@ SetTimer, WatchCursor, 100
 return
 
 DrawStart:
+AreaSet := False
 SetTimer, WatchCursor, Off
 CoordMode, Mouse, %CoordPixel%
 MouseGetPos, iX, iY
@@ -5521,7 +5522,9 @@ If (SS = 1)
 		return
 	}
 }
-If ((iX = eX) || (iY = eY)) && (control != "")
+If (AreaSet)
+	iX := wX, iY := wY, eX := wX + wW, eY := wY + wH
+Else If ((iX = eX) || (iY = eY)) && (control != "")
 	GuiControl, 19:ChooseString, CoordPixel, Window
 Else If (CoordPixel = "Screen")
 	iX := wX, iY := wY, eX := wX + wW, eY := wY + wH
@@ -12948,6 +12951,7 @@ LV_ModifyCol(3, 100)	; Manual
 LV_ModifyCol(4, 60)		; Loop
 LV_ModifyCol(5, 200)	; Context
 LV_ModifyCol(6, 45)		; Index
+LV_Modify(A_List, "Select Vis")
 Gui, 32:Show, W690 H500, %t_Lang145%
 
 If (A_ThisLabel = "EditSelectedMacro")

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ Pulover's Macro Creator is a Free Automation Tool and Script Generator based on
 
 [www.macrocreator.com](https://www.macrocreator.com)
 
-**Current Version:** 5.3.8
+**Current Version:** 5.3.9
 
 ### Supported platforms