diff --git a/Interface/AddOns/SVUI/framework/docks/dock_core.lua b/Interface/AddOns/SVUI/framework/docks/dock_core.lua index 7ae17b7..a5cbde6 100644 --- a/Interface/AddOns/SVUI/framework/docks/dock_core.lua +++ b/Interface/AddOns/SVUI/framework/docks/dock_core.lua @@ -126,6 +126,7 @@ _G.ToggleSuperDockLeft = function(self, button) end Dock.BottomLeft.Bar:Update() Dock:UpdateDockBackdrops() + SV.Events:Trigger("DOCK_LEFT_EXPANDED"); else if SV.cache.Docks.LeftFaded then SV.cache.Docks.LeftFaded = nil; @@ -164,6 +165,7 @@ _G.ToggleSuperDockRight = function(self, button) end Dock.BottomRight.Bar:Update() Dock:UpdateDockBackdrops() + SV.Events:Trigger("DOCK_RIGHT_EXPANDED"); else if SV.cache.Docks.RightFaded then SV.cache.Docks.RightFaded = nil; diff --git a/Interface/AddOns/SVUI/framework/docks/dock_stats.lua b/Interface/AddOns/SVUI/framework/docks/dock_stats.lua index cb279e9..11d4bfc 100644 --- a/Interface/AddOns/SVUI/framework/docks/dock_stats.lua +++ b/Interface/AddOns/SVUI/framework/docks/dock_stats.lua @@ -513,12 +513,6 @@ do slot:SetScript("OnEnter", nil) slot:SetScript("OnLeave", nil) slot:SetScript("OnClick", nil) - - if(db.dataBackdrop) then - slot.text:SetFont(LSM:Fetch("font", db.dataFont), db.dataFontSize, "NONE") - else - slot.text:SetFont(LSM:Fetch("font", db.dataFont), db.dataFontSize, db.dataFontOutline) - end slot.text:SetText(nil) diff --git a/Interface/AddOns/SVUI/packages/bag/SVBag.lua b/Interface/AddOns/SVUI/packages/bag/SVBag.lua index 24abe2e..903b72e 100644 --- a/Interface/AddOns/SVUI/packages/bag/SVBag.lua +++ b/Interface/AddOns/SVUI/packages/bag/SVBag.lua @@ -10,9 +10,7 @@ _____/\\\\\\\\\\\____/\\\________/\\\__/\\\________/\\\__/\\\\\\\\\\\_ # _\///\\\\\\\\\\\/________\//\\\________\///\\\\\\\\\/____/\\\\\\\\\\\_# ___\///////////___________\///___________\/////////_____\///////////_# ############################################################################## -S U P E R - V I L L A I N - U I By: Munglunch # -############################################################################## -credit: Elv. original logic from ElvUI. Adapted to SVUI # +S U P E R - V I L L A I N - U I By: Munglunch ############################################################################## ########################################################## LOCALIZED LUA FUNCTIONS @@ -1683,7 +1681,6 @@ function MOD:RefreshTokens() end end - local function _openBags() GameTooltip:Hide() MOD.BagFrame:Show() diff --git a/Interface/AddOns/SVUI/packages/bag/components/organization.lua b/Interface/AddOns/SVUI/packages/bag/components/organization.lua index f3c9ea1..0de4697 100644 --- a/Interface/AddOns/SVUI/packages/bag/components/organization.lua +++ b/Interface/AddOns/SVUI/packages/bag/components/organization.lua @@ -132,7 +132,9 @@ end function MOD:NewFilterMenu(bag) - hooksecurefunc(bag, "UpdateTooltip", BagMenu_OnEnter) + if(bag.UpdateTooltip) then + hooksecurefunc(bag, "UpdateTooltip", BagMenu_OnEnter) + end bag:HookScript("OnLeave", BagMenu_OnLeave) bag:HookScript("OnClick", BagMenu_OnClick) end diff --git a/Interface/AddOns/SVUI/packages/quest/SVQuest.lua b/Interface/AddOns/SVUI/packages/quest/SVQuest.lua index 9d0affb..95733c6 100644 --- a/Interface/AddOns/SVUI/packages/quest/SVQuest.lua +++ b/Interface/AddOns/SVUI/packages/quest/SVQuest.lua @@ -391,21 +391,27 @@ end function MOD:UpdateDimensions() local totalHeight = 1; - local scrollHeight = self.Docklet.ScrollFrame:GetHeight(); - local scrollWidth = self.Docklet.ScrollFrame:GetWidth(); + local scrollHeight = MOD.Docklet.ScrollFrame:GetHeight(); + local scrollWidth = MOD.Docklet.ScrollFrame:GetWidth(); - for headerName, headerFrame in pairs(self.Headers) do + for headerName, headerFrame in pairs(MOD.Headers) do totalHeight = totalHeight + headerFrame:GetHeight() headerFrame:SetWidth(scrollWidth) end - self.Docklet.ScrollFrame.MaxVal = totalHeight; - self.Docklet.ScrollFrame.ScrollBar:SetMinMaxValues(1, totalHeight); - self.Docklet.ScrollFrame.ScrollBar:SetHeight(scrollHeight); - self.Docklet.ScrollFrame.ScrollChild:SetWidth(scrollWidth); - self.Docklet.ScrollFrame.ScrollChild:SetHeight(totalHeight); + MOD.Docklet.ScrollFrame.MaxVal = totalHeight; + MOD.Docklet.ScrollFrame.ScrollBar:SetMinMaxValues(1, totalHeight); + MOD.Docklet.ScrollFrame.ScrollBar:SetHeight(scrollHeight); + MOD.Docklet.ScrollFrame.ScrollChild:SetWidth(scrollWidth); + MOD.Docklet.ScrollFrame.ScrollChild:SetHeight(totalHeight); end +local function ExpandQuestTracker() + SV.Timers:ExecuteTimer(MOD.UpdateDimensions, 0.2) +end + +SV.Events:On("DOCK_RIGHT_EXPANDED", "ExpandQuestTracker", ExpandQuestTracker); + function MOD:UpdateLocals() ROW_WIDTH = self.Docklet.ScrollFrame:GetWidth(); ROW_HEIGHT = SV.db.font.questdialog.size / 0.55; diff --git a/Interface/AddOns/SVUI/packages/tip/SVTip.lua b/Interface/AddOns/SVUI/packages/tip/SVTip.lua index 9502e8c..fec1234 100644 --- a/Interface/AddOns/SVUI/packages/tip/SVTip.lua +++ b/Interface/AddOns/SVUI/packages/tip/SVTip.lua @@ -648,7 +648,7 @@ local _hook_GameTooltip_SetDefaultAnchor = function(self, parent) if(SV.SVBag.BagFrame and SV.SVBag.BagFrame:IsShown()) then self:SetPoint("BOTTOMLEFT", SV.SVBag.BagFrame, "TOPLEFT", 0, 24) elseif(SV.Dock.BottomRight:GetAlpha() == 1 and SV.Dock.BottomRight:IsShown()) then - self:SetPoint("BOTTOMLEFT", SV.Dock.BottomRight, "TOPLEFT", 0, 24) + self:SetPoint("BOTTOMLEFT", SV.Dock.BottomRight.Window, "TOPLEFT", 0, 24) else self:SetPoint("BOTTOMLEFT", SV.Dock.BottomRight.Bar, "TOPLEFT", 0, 24) end diff --git a/Interface/AddOns/SVUI/packages/tool/buttons/raidleader.lua b/Interface/AddOns/SVUI/packages/tool/buttons/raidleader.lua index f39ea7e..dce692c 100644 --- a/Interface/AddOns/SVUI/packages/tool/buttons/raidleader.lua +++ b/Interface/AddOns/SVUI/packages/tool/buttons/raidleader.lua @@ -51,7 +51,7 @@ local Button_OnEnter = function(self) end local Button_OnLeave = function(self) - self:SetPanelColor("inverse") + self:SetPanelColor("default") GameTooltip:Hide() end @@ -68,7 +68,6 @@ end local ToolButton_OnEnter = function(self, ...) SVUI_RaidToolDockButton:SetPanelColor("highlight") - SVUI_RaidToolDockButton.Icon:SetGradient(unpack(SV.Media.gradient.bizzaro)) GameTooltip:SetOwner(self, "ANCHOR_BOTTOMLEFT", 0, 4) GameTooltip:ClearLines() @@ -80,7 +79,6 @@ end local ToolButton_OnLeave = function(self, ...) SVUI_RaidToolDockButton:SetPanelColor("default") - SVUI_RaidToolDockButton.Icon:SetGradient(unpack(SV.Media.gradient.icon)) GameTooltip:Hide() end @@ -91,7 +89,7 @@ local function NewToolButton(name, parent, template, width, height, point, relat button:SetWidthToScale(width) button:SetHeightToScale(height) button:SetPointToScale(point, relativeto, point2, xOfs, yOfs) - button:SetStylePanel("HeavyButton") + button:SetStylePanel("HeavyButton", true) if(textDisplay) then local text = button:CreateFontString(nil,"OVERLAY") @@ -116,13 +114,13 @@ function MOD:UpdateRaidLeader(event) return end if not CURRENT_PARENT then - CURRENT_PARENT = self.RaidTool.parent - end - if CheckRaidStatus() then - if not CURRENT_PARENT then + if not self.RaidTool.Parent then self.RaidTool.Menu:Hide() return end + CURRENT_PARENT = self.RaidTool.Parent + end + if CheckRaidStatus() then CURRENT_PARENT:Add(self.RaidTool) if self.RaidTool.Menu.toggled == true then self.RaidTool.Menu:Show() @@ -130,8 +128,8 @@ function MOD:UpdateRaidLeader(event) self.RaidTool.Menu:Hide() end else - CURRENT_PARENT = self.RaidTool.parent - CURRENT_PARENT:Remove(self.RaidTool) + CURRENT_PARENT = self.RaidTool.Parent + self.RaidTool.Parent:Remove(self.RaidTool) self.RaidTool.Menu:Hide() end end @@ -143,7 +141,7 @@ function MOD:LoadRaidLeaderTools() --self.RaidTool:SetAttribute("hasDropDown", false); self.RaidTool.Menu = CreateFrame("Frame", "SVUI_RaidToolMenu", self.RaidTool, "SecureHandlerClickTemplate"); - self.RaidTool.Menu:SetStylePanel("Frame", 'Transparent'); + self.RaidTool.Menu:SetStylePanel("Frame", "Heavy"); self.RaidTool.Menu:SetWidthToScale(120); self.RaidTool.Menu:SetHeightToScale(140); self.RaidTool.Menu:SetPoint("TOPLEFT", dock.ToolBar, "BOTTOMLEFT", 0, -2); @@ -166,18 +164,20 @@ function MOD:LoadRaidLeaderTools() local closeButton = self:GetFrameRef("SVUI_RaidToolCloseButton"); raidUtil:Show(); local point = location:GetPoint(); - local raidUtilPoint, raidUtilRelative, closeButtonPoint, closeButtonRelative + local raidUtilPoint, raidUtilRelative, raidUtil_Y, closeButtonPoint, closeButtonRelative if point:find("BOTTOM") then raidUtilPoint = "BOTTOMLEFT" - raidUtilRelative = "TOPLEFT" + raidUtilRelative = "TOPLEFT" + raidUtil_Y = 2 else raidUtilPoint = "TOPLEFT" - raidUtilRelative = "BOTTOMLEFT" + raidUtilRelative = "BOTTOMLEFT" + raidUtil_Y = -2 end raidUtil:ClearAllPoints() closeButton:ClearAllPoints() - raidUtil:SetPoint(raidUtilPoint, self, raidUtilRelative, 2, -2) + raidUtil:SetPoint(raidUtilPoint, self, raidUtilRelative, 2, raidUtil_Y) closeButton:SetPoint("BOTTOM", raidUtil, "BOTTOM", 0, 2) ]=]); SVUI_RaidToolToggle:SetScript("PostClick", DockletButton_OnPostClick); @@ -228,7 +228,7 @@ function MOD:LoadRaidLeaderTools() markerButton:SetHeightToScale(18) markerButton:SetWidth(109) markerButton:RemoveTextures() - markerButton:SetStylePanel("HeavyButton") + markerButton:SetStylePanel("HeavyButton", true) local markersText = markerButton:CreateFontString(nil,"OVERLAY") markersText:SetFont(SV.Media.font.default, 14, "NONE") diff --git a/Interface/AddOns/SVUI/packages/tool/stats/time.lua b/Interface/AddOns/SVUI/packages/tool/stats/time.lua index 602668e..e38dd35 100644 --- a/Interface/AddOns/SVUI/packages/tool/stats/time.lua +++ b/Interface/AddOns/SVUI/packages/tool/stats/time.lua @@ -63,6 +63,29 @@ local Update, lastPanel; -- UpValue local localizedName, isActive, canQueue, startTime, canEnter, _ local name, instanceID, reset, difficultyId, locked, extended, isRaid, maxPlayers, difficulty, numEncounters, encounterProgress +local DifficultyMap = { + [1] = "N", + [2] = "H", + [3] = "N", + [4] = "N", + [5] = "H", + [6] = "H", + [7] = "LFR", + [8] = "CM", + [9] = "N", + [10] = "", + [11] = "HSc", + [12] = "NSc", + [13] = "", + [14] = "N", + [15] = "H", + [16] = "M", + [17] = "LFR", + [18] = "E", + [19] = "E", + [20] = "ESc", +} + local function ValueColorUpdate(hex, r, g, b) europeDisplayFormat = join("", "%02d", hex, ":|r%02d") ukDisplayFormat = join("", "", "%d", hex, ":|r%02d", hex, " %s|r") @@ -150,11 +173,11 @@ local function OnEnter(self) lockoutColor = lockoutColorNormal end - local _, _, isHeroic, _ = GetDifficultyInfo(difficultyId) + local typeFlag = DifficultyMap[difficultyId] or ""; if (numEncounters and numEncounters > 0) and (encounterProgress and encounterProgress > 0) then - Dock.DataTooltip:AddDoubleLine(format(lockoutInfoFormat, maxPlayers, (isHeroic and "H" or "N"), name, encounterProgress, numEncounters), SecondsToTime(reset, false, nil, 3), 1, 1, 1, lockoutColor.r, lockoutColor.g, lockoutColor.b) + Dock.DataTooltip:AddDoubleLine(format(lockoutInfoFormat, maxPlayers, typeFlag, name, encounterProgress, numEncounters), SecondsToTime(reset, false, nil, 3), 1, 1, 1, lockoutColor.r, lockoutColor.g, lockoutColor.b) else - Dock.DataTooltip:AddDoubleLine(format(lockoutInfoFormatNoEnc, maxPlayers, (isHeroic and "H" or "N"), name), SecondsToTime(reset, false, nil, 3), 1, 1, 1, lockoutColor.r, lockoutColor.g, lockoutColor.b) + Dock.DataTooltip:AddDoubleLine(format(lockoutInfoFormatNoEnc, maxPlayers, typeFlag, name), SecondsToTime(reset, false, nil, 3), 1, 1, 1, lockoutColor.r, lockoutColor.g, lockoutColor.b) end end end diff --git a/Interface/AddOns/SVUI/packages/tool/stats/tokens.lua b/Interface/AddOns/SVUI/packages/tool/stats/tokens.lua index 27eb32e..266527c 100644 --- a/Interface/AddOns/SVUI/packages/tool/stats/tokens.lua +++ b/Interface/AddOns/SVUI/packages/tool/stats/tokens.lua @@ -65,6 +65,7 @@ local function TokenInquiry(id, weekly, capped) elseif capped then if id == 392 or id == 395 then maxed = 4000 end if id == 396 then maxed = 3000 end + if id == 994 then maxed = 10 end if discovered then altStr = ("%d / %d"):format(amount, maxed) Dock.DataTooltip:AddDoubleLine(texStr, altStr, r, g, b, r, g, b) @@ -130,6 +131,7 @@ local function CacheTokenData(self) AddToTokenMenu(self, 1008, key) AddToTokenMenu(self, 1017, key) end + AddToTokenMenu(self, 994, key) AddToTokenMenu(self, 697, key) AddToTokenMenu(self, 738, key) AddToTokenMenu(self, 615, key) @@ -174,6 +176,7 @@ local function Tokens_OnEnter(self) Dock.DataTooltip:AddLine(" ") Dock.DataTooltip:AddLine("Raiding and Dungeons") + TokenInquiry(994, false, true) TokenInquiry(697, false, true) TokenInquiry(738) TokenInquiry(615) diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/_load.xml b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/_load.xml index 330b1b0..7620688 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/_load.xml +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/_load.xml @@ -47,6 +47,6 @@ <Script file='voidstorage.lua'/> <Script file='worldmap.lua'/> <Script file='worldstate.lua'/> - <Script file='store.lua'/> + <!-- <Script file='store.lua'/> --> <Script file='system.lua'/> </Ui> \ No newline at end of file