diff --git a/SVUI_!Core/SVUI_!Core.toc b/SVUI_!Core/SVUI_!Core.toc index 392c6ee..36a7fac 100644 --- a/SVUI_!Core/SVUI_!Core.toc +++ b/SVUI_!Core/SVUI_!Core.toc @@ -1,6 +1,6 @@ ## Interface: 60100 ## Author: Munglunch -## Version: 1.1.3 +## Version: 1.1.4 ## Title: |cffFF9900SuperVillain UI: |r|cff00FF00!Core|r ## Notes: SVUI [|cff9911FFCore Framework|r]. ## SavedVariables: SVUI_Global, SVUI_Errors, SVUI_Filters, SVUI_Media diff --git a/SVUI_!Options/SVUI_!Options.toc b/SVUI_!Options/SVUI_!Options.toc index bba42cc..0cbb331 100644 --- a/SVUI_!Options/SVUI_!Options.toc +++ b/SVUI_!Options/SVUI_!Options.toc @@ -1,6 +1,6 @@ ## Interface: 60100 ## Author: Munglunch -## Version: 1.1.3 +## Version: 1.1.4 ## Title: |cffFF9900SuperVillain UI: |r|cff00FF00!Options|r ## Notes: SVUI [|cff9911FFConfig Options|r] ## RequiredDeps: SVUI_!Core diff --git a/SVUI_ActionBars/SVUI_ActionBars.toc b/SVUI_ActionBars/SVUI_ActionBars.toc index 0b0ba73..8de644a 100644 --- a/SVUI_ActionBars/SVUI_ActionBars.toc +++ b/SVUI_ActionBars/SVUI_ActionBars.toc @@ -1,6 +1,6 @@ ## Interface: 60100 ## Author: Munglunch -## Version: 1.1.3 +## Version: 1.1.4 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00Action Bars|r ## Notes: Action Bar Plugin for [|cff9911FFSVUI|r]. ## OptionalDeps: LibSharedMedia-3.0, LibActionButton-1.0 diff --git a/SVUI_Auras/SVUI_Auras.toc b/SVUI_Auras/SVUI_Auras.toc index 60d24e1..4e96b38 100644 --- a/SVUI_Auras/SVUI_Auras.toc +++ b/SVUI_Auras/SVUI_Auras.toc @@ -1,6 +1,6 @@ ## Interface: 60100 ## Author: Munglunch -## Version: 1.1.3 +## Version: 1.1.4 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00Auras|r ## Notes: Aura Plugin for [|cff9911FFSVUI|r]. ## OptionalDeps: LibSharedMedia-3.0 diff --git a/SVUI_Chat/SVUI_Chat.toc b/SVUI_Chat/SVUI_Chat.toc index deab735..1590742 100644 --- a/SVUI_Chat/SVUI_Chat.toc +++ b/SVUI_Chat/SVUI_Chat.toc @@ -1,6 +1,6 @@ ## Interface: 60100 ## Author: Munglunch -## Version: 1.1.3 +## Version: 1.1.4 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00Chat|r ## Notes: Chat Plugin for [|cff9911FFSVUI|r]. ## SavedVariablesPerCharacter: SVUI_Private_ChatCache diff --git a/SVUI_Inventory/SVUI_Inventory.lua b/SVUI_Inventory/SVUI_Inventory.lua index 63f75e6..fed3e0b 100644 --- a/SVUI_Inventory/SVUI_Inventory.lua +++ b/SVUI_Inventory/SVUI_Inventory.lua @@ -1594,44 +1594,80 @@ function MOD:RefreshTokens() end end +local NEXT_ACTION_ALLOWED = true; local function _openBags() --print('_openBags') GameTooltip:Hide() - MOD.BagFrame:Show() - MOD.BagFrame:RefreshBags() - if(SV.Tooltip) then - SV.Tooltip.GameTooltip_SetDefaultAnchor(GameTooltip) + if(not MOD.BagFrame:IsShown()) then + MOD.BagFrame:Show() + MOD.BagFrame:RefreshBags() + if(SV.Tooltip) then + SV.Tooltip.GameTooltip_SetDefaultAnchor(GameTooltip) + end + MOD.BagFrame.editBox:SearchReset() + NEXT_ACTION_ALLOWED = true end - MOD.BagFrame.editBox:SearchReset() end local function _closeBags() --print('_closeBags') GameTooltip:Hide() - MOD.BagFrame:Hide() - if(MOD.BankFrame) then - MOD.BankFrame:Hide() + if(MOD.BagFrame:IsShown()) then + MOD.BagFrame:Hide() + if(MOD.BankFrame) then + MOD.BankFrame:Hide() + end + if(MOD.ReagentFrame) then + MOD.ReagentFrame:Hide() + end + if(SV.Dock.CloseBreakStuff) then + SV.Dock:CloseBreakStuff() + end + if(SV.Tooltip) then + SV.Tooltip.GameTooltip_SetDefaultAnchor(GameTooltip) + end + MOD.BagFrame.editBox:SearchReset() + NEXT_ACTION_ALLOWED = true end - if(MOD.ReagentFrame) then - MOD.ReagentFrame:Hide() +end + +local function _openAllBags() + if(NEXT_ACTION_ALLOWED) then + --print('_openAllBags') + _openBags() end - if(SV.Dock.CloseBreakStuff) then - SV.Dock:CloseBreakStuff() + NEXT_ACTION_ALLOWED = false; +end + +local function _closeAllBags() + if(not NEXT_ACTION_ALLOWED) then + --print('_closeAllBags') + _closeBags() end - if(SV.Tooltip) then - SV.Tooltip.GameTooltip_SetDefaultAnchor(GameTooltip) + NEXT_ACTION_ALLOWED = false; +end + +local function _openBackpack() + _openBags() + --NEXT_ACTION_ALLOWED = false; +end + +local function _closeBackpack() + if(NEXT_ACTION_ALLOWED) then + --print('_closeBackpack') + _closeBags() end - MOD.BagFrame.editBox:SearchReset() + NEXT_ACTION_ALLOWED = false; end local function _toggleByID(bagID) if(not bagID) then return end local size = GetContainerNumSlots(bagID); if(size == 0) then return end - if(not MOD.BagFrame:IsShown()) then - _openBags() - end + --print('ToggleBag: '..bagID) + _openBags() + NEXT_ACTION_ALLOWED = false; if(MOD.BagFrame.Bags[bagID]) then MOD.BagFrame.Bags[bagID]:RefreshSlots() elseif(MOD.BankFrame and MOD.BankFrame.Bags[bagID]) then @@ -1641,10 +1677,27 @@ local function _toggleByID(bagID) end end +local function _toggleAllBags() + if(NEXT_ACTION_ALLOWED) then + if(IsBagOpen(0)) then + --print('ToggleAllBags: OPEN') + _openBags() + else + --print('ToggleAllBags: CLOSE') + _closeBags() + end + end + NEXT_ACTION_ALLOWED = true +end + local function _toggleBackpack() - if(not IsBagOpen(0)) then - _closeBags() + if(NEXT_ACTION_ALLOWED) then + if(not IsBagOpen(0)) then + --print('ToggleBackpack: CLOSE') + _closeBags() + end end + NEXT_ACTION_ALLOWED = true end local _hook_OnModifiedClick = function(self, button) @@ -1740,12 +1793,12 @@ function MOD:Load() if(frame) then frame:Die() end end - --hooksecurefunc("OpenAllBags", _openBags) - hooksecurefunc("OpenBackpack", _openBags) - --hooksecurefunc("CloseAllBags", _closeBags) - hooksecurefunc("CloseBackpack", _closeBags) + hooksecurefunc("OpenAllBags", _openAllBags) + hooksecurefunc("OpenBackpack", _openBackpack) + hooksecurefunc("CloseAllBags", _closeAllBags) + hooksecurefunc("CloseBackpack", _closeBackpack) hooksecurefunc("ToggleBag", _toggleByID) - --hooksecurefunc("ToggleAllBags", _toggleBackpack) + hooksecurefunc("ToggleAllBags", _toggleAllBags) hooksecurefunc("ToggleBackpack", _toggleBackpack) hooksecurefunc("BackpackTokenFrame_Update", self.RefreshTokens) hooksecurefunc("ContainerFrameItemButton_OnModifiedClick", _hook_OnModifiedClick) diff --git a/SVUI_Inventory/SVUI_Inventory.toc b/SVUI_Inventory/SVUI_Inventory.toc index 748cc9e..3c57f28 100644 --- a/SVUI_Inventory/SVUI_Inventory.toc +++ b/SVUI_Inventory/SVUI_Inventory.toc @@ -1,6 +1,6 @@ ## Interface: 60100 ## Author: Munglunch -## Version: 1.1.3 +## Version: 1.1.4 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00Inventory|r ## Notes: Inventory Plugin for [|cff9911FFSVUI|r]. ## SavedVariables: SVUI_LootCache diff --git a/SVUI_Maps/SVUI_Maps.toc b/SVUI_Maps/SVUI_Maps.toc index da2674b..3d3d4b0 100644 --- a/SVUI_Maps/SVUI_Maps.toc +++ b/SVUI_Maps/SVUI_Maps.toc @@ -1,6 +1,6 @@ ## Interface: 60100 ## Author: Munglunch -## Version: 1.1.3 +## Version: 1.1.4 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00Maps|r ## Notes: Maps Plugin for [|cff9911FFSVUI|r]. ## OptionalDeps: LibSharedMedia-3.0 diff --git a/SVUI_NamePlates/SVUI_NamePlates.toc b/SVUI_NamePlates/SVUI_NamePlates.toc index 8bb6571..b4aa54a 100644 --- a/SVUI_NamePlates/SVUI_NamePlates.toc +++ b/SVUI_NamePlates/SVUI_NamePlates.toc @@ -1,6 +1,6 @@ ## Interface: 60100 ## Author: Munglunch -## Version: 1.1.3 +## Version: 1.1.4 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00NamePlates|r ## Notes: NamePlates Plugin for [|cff9911FFSVUI|r]. ## OptionalDeps: LibSharedMedia-3.0 diff --git a/SVUI_QuestTracker/SVUI_QuestTracker.toc b/SVUI_QuestTracker/SVUI_QuestTracker.toc index fefee03..143700a 100644 --- a/SVUI_QuestTracker/SVUI_QuestTracker.toc +++ b/SVUI_QuestTracker/SVUI_QuestTracker.toc @@ -1,6 +1,6 @@ ## Interface: 60100 ## Author: Munglunch -## Version: 1.1.3 +## Version: 1.1.4 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00QuestTracker|r ## Notes: QuestTracker Plugin for [|cff9911FFSVUI|r]. ## OptionalDeps: LibSharedMedia-3.0 diff --git a/SVUI_Skins/SVUI_Skins.toc b/SVUI_Skins/SVUI_Skins.toc index 04cbd81..ad610ee 100644 --- a/SVUI_Skins/SVUI_Skins.toc +++ b/SVUI_Skins/SVUI_Skins.toc @@ -1,6 +1,6 @@ ## Interface: 60100 ## Author: Munglunch, Azilroka, Sortokk -## Version: 1.1.3 +## Version: 1.1.4 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00Skins|r ## Notes: SVUI [|cff9911FFSkins System and AddOn Frames|r]. ## SavedVariables: SVUIUI_STYLE_GLOBAL diff --git a/SVUI_Tooltip/SVUI_Tooltip.toc b/SVUI_Tooltip/SVUI_Tooltip.toc index 77eaabf..0980475 100644 --- a/SVUI_Tooltip/SVUI_Tooltip.toc +++ b/SVUI_Tooltip/SVUI_Tooltip.toc @@ -1,6 +1,6 @@ ## Interface: 60100 ## Author: Munglunch -## Version: 1.1.3 +## Version: 1.1.4 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00Tooltip|r ## Notes: Tooltip Plugin for [|cff9911FFSVUI|r]. ## OptionalDeps: LibSharedMedia-3.0 diff --git a/SVUI_UnitFrames/Loader.lua b/SVUI_UnitFrames/Loader.lua index 11be3aa..15a5533 100644 --- a/SVUI_UnitFrames/Loader.lua +++ b/SVUI_UnitFrames/Loader.lua @@ -1338,10 +1338,10 @@ SV.defaults[Schema] = { ["buffs"] = { ["enable"] = true, - ["perrow"] = 2, + ["perrow"] = 4, ["numrows"] = 1, ["attachTo"] = "FRAME", - ["anchorPoint"] = "LEFT", + ["anchorPoint"] = "LEFTBOTTOM", ["verticalGrowth"] = "UP", ["horizontalGrowth"] = "LEFT", ["filterWhiteList"] = false, @@ -1351,17 +1351,17 @@ SV.defaults[Schema] = { ["filterInfinite"] = false, ["filterDispellable"] = false, ["useFilter"] = "", - ["xOffset"] = 0, + ["xOffset"] = -6, ["yOffset"] = 0, - ["sizeOverride"] = 0, + ["sizeOverride"] = 20, }, ["debuffs"] = { ["enable"] = true, - ["perrow"] = 3, + ["perrow"] = 4, ["numrows"] = 1, - ["attachTo"] = "BUFFS", - ["anchorPoint"] = "LEFT", + ["attachTo"] = "FRAME", + ["anchorPoint"] = "LEFTTOP", ["verticalGrowth"] = "UP", ["horizontalGrowth"] = "LEFT", ["filterWhiteList"] = false, @@ -1370,9 +1370,9 @@ SV.defaults[Schema] = { ["filterInfinite"] = false, ["filterDispellable"] = false, ["useFilter"] = "", - ["xOffset"] = 0, + ["xOffset"] = -6, ["yOffset"] = 0, - ["sizeOverride"] = 0, + ["sizeOverride"] = 20, }, ["castbar"] = { @@ -1471,43 +1471,42 @@ SV.defaults[Schema] = { ["buffs"] = { ["enable"] = true, - ["perrow"] = 3, + ["perrow"] = 8, ["numrows"] = 1, ["attachTo"] = "FRAME", - ["anchorPoint"] = "LEFT", + ["anchorPoint"] = "LEFTBOTTOM", ["verticalGrowth"] = "UP", - ["horizontalGrowth"] = "LEFT", + ["horizontalGrowth"] = "LEFT", ["filterWhiteList"] = false, ["filterPlayer"] = false, ["filterRaid"] = false, ["filterAll"] = false, ["filterInfinite"] = false, ["filterDispellable"] = false, - ["useFilter"] = "Shield", - ["xOffset"] = 0, - ["yOffset"] = 0, - ["sizeOverride"] = 0, + ["useFilter"] = "", + ["xOffset"] = -6, + ["yOffset"] = 0, + ["sizeOverride"] = 20, }, ["debuffs"] = { ["enable"] = true, - ["perrow"] = 3, + ["perrow"] = 8, ["numrows"] = 1, - ["attachTo"] = "BUFFS", - ["anchorPoint"] = "LEFT", + ["attachTo"] = "FRAME", + ["anchorPoint"] = "LEFTTOP", ["verticalGrowth"] = "UP", ["horizontalGrowth"] = "LEFT", ["filterWhiteList"] = false, ["filterPlayer"] = false, - ["filterRaid"] = false, ["filterAll"] = false, ["filterInfinite"] = false, ["filterDispellable"] = false, - ["useFilter"] = "CC", - ["xOffset"] = 0, - ["yOffset"] = 0, - ["sizeOverride"] = 0, - }, + ["useFilter"] = "", + ["xOffset"] = -6, + ["yOffset"] = 0, + ["sizeOverride"] = 20, + }, ["castbar"] = { ["enable"] = true, @@ -1618,11 +1617,11 @@ SV.defaults[Schema] = { }, ["buffs"] = { - ["enable"] = false, + ["enable"] = true, ["perrow"] = 2, ["numrows"] = 1, ["attachTo"] = "FRAME", - ["anchorPoint"] = "RIGHTTOP", + ["anchorPoint"] = "RIGHTBOTTOM", ["verticalGrowth"] = "DOWN", ["horizontalGrowth"] = "RIGHT", ["filterWhiteList"] = false, @@ -1634,26 +1633,26 @@ SV.defaults[Schema] = { ["useFilter"] = "", ["xOffset"] = 8, ["yOffset"] = 0, - ["sizeOverride"] = 0, + ["sizeOverride"] = 20, }, ["debuffs"] = { ["enable"] = true, - ["perrow"] = 2, + ["perrow"] = 4, ["numrows"] = 1, ["attachTo"] = "FRAME", ["anchorPoint"] = "RIGHTTOP", - ["verticalGrowth"] = "DOWN", + ["verticalGrowth"] = "UP", ["horizontalGrowth"] = "RIGHT", ["filterWhiteList"] = false, ["filterPlayer"] = false, ["filterAll"] = false, ["filterInfinite"] = false, - ["filterDispellable"] = false, + ["filterDispellable"] = true, ["useFilter"] = "", ["xOffset"] = 8, ["yOffset"] = 0, - ["sizeOverride"] = 0, + ["sizeOverride"] = 22, }, ["auraWatch"] = { diff --git a/SVUI_UnitFrames/SVUI_UnitFrames.toc b/SVUI_UnitFrames/SVUI_UnitFrames.toc index 72f79a1..c335b8f 100644 --- a/SVUI_UnitFrames/SVUI_UnitFrames.toc +++ b/SVUI_UnitFrames/SVUI_UnitFrames.toc @@ -1,6 +1,6 @@ ## Interface: 60100 ## Author: Munglunch -## Version: 1.1.3 +## Version: 1.1.4 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00UnitFrames|r ## Notes: UnitFrames Plugin for [|cff9911FFSVUI|r]. ## OptionalDeps: LibSharedMedia-3.0