* Fixing bug with named operators.

* Fixed scroll bug during operations with groups enabled.
Pulover · Dec 28, 2020 · 4b71fe8 · 4b71fe8
1 parent 27e0d28
commit 4b71fe8
Show file tree

Hide file tree

Showing 8 changed files with 714 additions and 699 deletions.
diff --git a/Documentation/About.md b/Documentation/About.md
@@ -7,8 +7,8 @@
 Author: Pulover \[Rodolfo U. Batista\]  
 Copyright © 2012-2020 Rodolfo U. Batista  
 
-Version: 5.3.7  
-Release Date: November, 2020  
+Version: 5.3.8  
+Release Date: December, 2020  
 AutoHotkey Version: 1.1.32.00  
 
 Software License: [GNU General Public License](License.html)  
@@ -38,6 +38,10 @@ chosen1ft for suggestions and testing.
 
 # Change Log
 
+## Version 5.3.8
+* Fixing bug with named operators.
+* Fixed scroll bug during operations with groups enabled.
+
 ## Version 5.3.7
 * Fixed *A_* variables not accessible in nested Loop commands.
 * Fixed bugs with quotes in expressions.

diff --git a/Documentation/MacroCreator_Help.ahk b/Documentation/MacroCreator_Help.ahk
@@ -1,7 +1,7 @@
 /*!
 	Library: Pulover's Macro Creator
 		
-		# Version: 5.3.7
+		# Version: 5.3.8
 		[www.macrocreator.com](https://www.macrocreator.com)  
 		[Forum](https://www.autohotkey.com/boards/viewforum.php?f=63)
 		

diff --git a/LIB/Class_LV_Rows.ahk b/LIB/Class_LV_Rows.ahk
@@ -534,9 +534,10 @@ Class LV_Rows extends LV_Rows.LV_EX
 ;        ScrollDelay:    Delay in miliseconds for AutoScroll. Default is 100ms.
 ;        LineThick:      Thickness of the destination bar in pixels. Default is 2px.
 ;        Color:          Color of destination bar. Default is "Black".
+;        Drop:           Set to False to disable automatically dropping selected rows.
 ;    Return:             The destination row number.
 ;=======================================================================================
-    Drag(DragButton := "D", AutoScroll := true, ScrollDelay := 100, LineThick := 2, Color := "Black")
+    Drag(DragButton := "D", AutoScroll := true, ScrollDelay := 100, LineThick := 2, Color := "Black", Drop := true)
     {
         Static LVIR_LABEL          := 0x0002
         Static LVM_GETITEMCOUNT    := 0x1004
@@ -633,9 +634,9 @@ Class LV_Rows extends LV_Rows.LV_EX
             }
         }
 
-        If (DragButton = "LButton" && LV_currRow)
+        Gui, MarkLine:Cancel
+        If (Drop && DragButton = "LButton" && LV_currRow)
         {
-            Gui, MarkLine:Cancel
             CopyData := this.CopyData.Clone()
             Lines := this.Copy()
         ,   this.Paste(LV_currRow)
@@ -975,7 +976,10 @@ Class LV_Rows extends LV_Rows.LV_EX
 ;=======================================================================================
     RefreshGroups(Collapsed := "")
     {
-        GroupStates := []
+        GroupsEnabled := this.IsGroupViewEnabled()
+    ,   this.EnableGroupView(false)
+
+    ,   GroupStates := []
         Gui, Listview, % this.LVHwnd
         For e, g in this.Handle.GroupsArray
         {
@@ -989,7 +993,7 @@ Class LV_Rows extends LV_Rows.LV_EX
             If (this.Handle.GroupsArray[GrNum].Row = A_Index)
             {
                 Group := this.Handle.GroupsArray[GrNum]
-                this.GroupInsert(Group.ID, Group.Name)
+            ,   this.GroupInsert(Group.ID, Group.Name)
             ,   Styles := !this.Collapsible ? []
                                         : Collapsed = "" ? ["Collapsible", GroupStates[GrNum]]
                                         : Collapsed ? ["Collapsible", "Collapsed"]
@@ -999,6 +1003,7 @@ Class LV_Rows extends LV_Rows.LV_EX
             }
             this.SetGroup(A_Index, Group.ID)
         }
+        this.EnableGroupView(GroupsEnabled)
     }
 ;=======================================================================================
 ;    Internal Functions: These functions are meant for internal use but can also

diff --git a/LIB/Eval.ahk b/LIB/Eval.ahk
@@ -810,6 +810,12 @@ Exprt(e)
 ,	e:=StrReplace(e,c1 "vNot" c1 "\.","!")
 ,	e:=StrReplace(e,c1 "vAnd" c1 "\.","&&")
 ,	e:=StrReplace(e,c1 "vOr" c1 "\.","||")
+,	e:=StrReplace(e,"\." c1 "vNot" c1 . c1,"!")
+,	e:=StrReplace(e,"\." c1 "vAnd" c1 . c1,"&&")
+,	e:=StrReplace(e,"\." c1 "vOr" c1 . c1,"||")
+,	e:=StrReplace(e,c1 "vNot" c1 . c1,"!")
+,	e:=StrReplace(e,c1 "vAnd" c1 . c1,"&&")
+,	e:=StrReplace(e,c1 "vOr" c1 . c1,"||")
 ,	e:=RegExReplace(e,"S)(^|[^" . c1 . "\)-])-" . c1 . "(?=[lvf])","$1\-" . c1)
 ,	e:=RegExReplace(e,"S)(^|[^" . c1 . "\)&])&" . c1 . "(?=[lvf])","$1\&" . c1)
 ,	e:=RegExReplace(e,"S)(^|[^" . c1 . "\)\*])\*" . c1 . "(?=[lvf])","$1\*" . c1)