Skip to content

Commit 4b71fe8

Browse files
committed
* Fixing bug with named operators.
* Fixed scroll bug during operations with groups enabled.
1 parent 27e0d28 commit 4b71fe8

File tree

8 files changed

+714
-699
lines changed

8 files changed

+714
-699
lines changed

Documentation/About.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
Author: Pulover \[Rodolfo U. Batista\]
88
Copyright © 2012-2020 Rodolfo U. Batista
99

10-
Version: 5.3.7
11-
Release Date: November, 2020
10+
Version: 5.3.8
11+
Release Date: December, 2020
1212
AutoHotkey Version: 1.1.32.00
1313

1414
Software License: [GNU General Public License](License.html)
@@ -38,6 +38,10 @@ chosen1ft for suggestions and testing.
3838

3939
# Change Log
4040

41+
## Version 5.3.8
42+
* Fixing bug with named operators.
43+
* Fixed scroll bug during operations with groups enabled.
44+
4145
## Version 5.3.7
4246
* Fixed *A_* variables not accessible in nested Loop commands.
4347
* Fixed bugs with quotes in expressions.

Documentation/MacroCreator_Help.ahk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*!
22
Library: Pulover's Macro Creator
33
4-
# Version: 5.3.7
4+
# Version: 5.3.8
55
[www.macrocreator.com](https://www.macrocreator.com)
66
[Forum](https://www.autohotkey.com/boards/viewforum.php?f=63)
77

LIB/Class_LV_Rows.ahk

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -534,9 +534,10 @@ Class LV_Rows extends LV_Rows.LV_EX
534534
; ScrollDelay: Delay in miliseconds for AutoScroll. Default is 100ms.
535535
; LineThick: Thickness of the destination bar in pixels. Default is 2px.
536536
; Color: Color of destination bar. Default is "Black".
537+
; Drop: Set to False to disable automatically dropping selected rows.
537538
; Return: The destination row number.
538539
;=======================================================================================
539-
Drag(DragButton := "D", AutoScroll := true, ScrollDelay := 100, LineThick := 2, Color := "Black")
540+
Drag(DragButton := "D", AutoScroll := true, ScrollDelay := 100, LineThick := 2, Color := "Black", Drop := true)
540541
{
541542
Static LVIR_LABEL := 0x0002
542543
Static LVM_GETITEMCOUNT := 0x1004
@@ -633,9 +634,9 @@ Class LV_Rows extends LV_Rows.LV_EX
633634
}
634635
}
635636

636-
If (DragButton = "LButton" && LV_currRow)
637+
Gui, MarkLine:Cancel
638+
If (Drop && DragButton = "LButton" && LV_currRow)
637639
{
638-
Gui, MarkLine:Cancel
639640
CopyData := this.CopyData.Clone()
640641
Lines := this.Copy()
641642
, this.Paste(LV_currRow)
@@ -975,7 +976,10 @@ Class LV_Rows extends LV_Rows.LV_EX
975976
;=======================================================================================
976977
RefreshGroups(Collapsed := "")
977978
{
978-
GroupStates := []
979+
GroupsEnabled := this.IsGroupViewEnabled()
980+
, this.EnableGroupView(false)
981+
982+
, GroupStates := []
979983
Gui, Listview, % this.LVHwnd
980984
For e, g in this.Handle.GroupsArray
981985
{
@@ -989,7 +993,7 @@ Class LV_Rows extends LV_Rows.LV_EX
989993
If (this.Handle.GroupsArray[GrNum].Row = A_Index)
990994
{
991995
Group := this.Handle.GroupsArray[GrNum]
992-
this.GroupInsert(Group.ID, Group.Name)
996+
, this.GroupInsert(Group.ID, Group.Name)
993997
, Styles := !this.Collapsible ? []
994998
: Collapsed = "" ? ["Collapsible", GroupStates[GrNum]]
995999
: Collapsed ? ["Collapsible", "Collapsed"]
@@ -999,6 +1003,7 @@ Class LV_Rows extends LV_Rows.LV_EX
9991003
}
10001004
this.SetGroup(A_Index, Group.ID)
10011005
}
1006+
this.EnableGroupView(GroupsEnabled)
10021007
}
10031008
;=======================================================================================
10041009
; Internal Functions: These functions are meant for internal use but can also

LIB/Eval.ahk

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -810,6 +810,12 @@ Exprt(e)
810810
, e:=StrReplace(e,c1 "vNot" c1 "\.","!")
811811
, e:=StrReplace(e,c1 "vAnd" c1 "\.","&&")
812812
, e:=StrReplace(e,c1 "vOr" c1 "\.","||")
813+
, e:=StrReplace(e,"\." c1 "vNot" c1 . c1,"!")
814+
, e:=StrReplace(e,"\." c1 "vAnd" c1 . c1,"&&")
815+
, e:=StrReplace(e,"\." c1 "vOr" c1 . c1,"||")
816+
, e:=StrReplace(e,c1 "vNot" c1 . c1,"!")
817+
, e:=StrReplace(e,c1 "vAnd" c1 . c1,"&&")
818+
, e:=StrReplace(e,c1 "vOr" c1 . c1,"||")
813819
, e:=RegExReplace(e,"S)(^|[^" . c1 . "\)-])-" . c1 . "(?=[lvf])","$1\-" . c1)
814820
, e:=RegExReplace(e,"S)(^|[^" . c1 . "\)&])&" . c1 . "(?=[lvf])","$1\&" . c1)
815821
, e:=RegExReplace(e,"S)(^|[^" . c1 . "\)\*])\*" . c1 . "(?=[lvf])","$1\*" . c1)

0 commit comments

Comments
 (0)