Skip to content

Commit eed7516

Browse files
authored
Merge pull request #2007 from LarryThiessen/feat-2004-tab-line-builder
#2004 Build the whole macro line from the Tab menu
2 parents 41fcb17 + 4e820b8 commit eed7516

4 files changed

Lines changed: 650 additions & 21 deletions

File tree

.luacheckrc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -518,6 +518,11 @@ globals = {
518518
"PlayerSpellsFrame",
519519
"C_SpellBook",
520520
"MenuUtil",
521+
"MenuResponse",
522+
"Menu",
523+
"MenuVariants",
524+
"AnchorUtil",
525+
"GameTooltip_AddNormalLine",
521526
"SetBindingClick",
522527
"GSE3Storage",
523528
"C_ClassTalents",

GSE/Localization/ModL_enUS.lua

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -648,6 +648,20 @@ L["Manage Variables"] = true
648648
L["Insert GSE Sequence"] = true
649649
L["Insert GSE Variable"] = true
650650
L["Insert Spell"] = true
651+
L["Commands"] = true
652+
L["Conditionals"] = true
653+
L["Spells"] = true
654+
L["GSE Variables"] = true
655+
L["Reset"] = true
656+
L["Only valid after a /castsequence command."] = true
657+
L["Requires a reset= on the line."] = true
658+
L["Start the line with a command first."] = true
659+
L["Undo Last"] = true
660+
L["Boiler Plates"] = true
661+
L["Nothing to undo yet."] = true
662+
L["Only valid after a spell."] = true
663+
L["Must be alone in the block - clear the block first."] = true
664+
L["The block holds a macro name or variable - it must stay alone."] = true
651665
L[
652666
"The UI has been set to KeyDown configuration. The /click command needs to be `/click TEMPLATENAME LeftButton t` (Note the 't' here is required along with the LeftButton.) You will need to check your macros and adjust your click commands."
653667
] = true

GSE_GUI/Editor.lua

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7512,6 +7512,12 @@ function GSE.CreateEditor()
75127512
macroEditBox:SetCallback(
75137513
"OnEditFocusLost",
75147514
function(sel)
7515+
-- During a Tab line-builder session the commit repaint would
7516+
-- inject colour codes mid-build and shift the session's raw
7517+
-- caret offsets; the session suppresses it and it runs on the
7518+
-- next real focus-loss after the menu is gone.
7519+
local eb = sel and (sel.editBox or sel.editbox)
7520+
if eb and (eb.gseTabSessionUntil or 0) > GetTime() then return end
75157521
-- Apply translation + coloring on focus-loss, not every
75167522
-- keystroke. See matching comment in MacroToolbar.lua.
75177523
-- Cancel any pending debounced live pass so it can't fire

0 commit comments

Comments
 (0)