diff --git a/SVUI_!Core/libs/_SVUI_Lib/Registry.lua b/SVUI_!Core/libs/_SVUI_Lib/Registry.lua index 2e9c24d..8df333e 100644 --- a/SVUI_!Core/libs/_SVUI_Lib/Registry.lua +++ b/SVUI_!Core/libs/_SVUI_Lib/Registry.lua @@ -1002,7 +1002,7 @@ function lib:NewCore(gfile, efile, pfile, mfile) CoreObject.NameID = CoreGlobalName; CoreObject.Version = AddonVersion; CoreObject.GameVersion = tonumber(InterfaceVersion); - CoreObject.DebugMode = false; + CoreObject.DebugMode = true; CoreObject.HasErrors = false; CoreObject.Schema = GetAddOnMetadata(CoreName, SchemaFromMeta); CoreObject.TitleID = GetAddOnMetadata(CoreName, HeaderFromMeta); diff --git a/SVUI_!Core/system/_docklets/garrison.lua b/SVUI_!Core/system/_docklets/garrison.lua index 53cee10..f6566db 100644 --- a/SVUI_!Core/system/_docklets/garrison.lua +++ b/SVUI_!Core/system/_docklets/garrison.lua @@ -291,6 +291,7 @@ local function LoadToolBarGarrison() mmButton:SetNormalTexture("") mmButton:SetPushedTexture("") mmButton:SetHighlightTexture("") + mmButton:EnableMouse(false) if(not mmButton:IsShown()) then garrison.Parent:SetWidth(garrison.Parent:GetWidth() - garrison:GetWidth()) diff --git a/SVUI_!Core/system/api.lua b/SVUI_!Core/system/api.lua index a7c1522..b416b74 100644 --- a/SVUI_!Core/system/api.lua +++ b/SVUI_!Core/system/api.lua @@ -938,8 +938,7 @@ local function CommonButtonSettings(frame, addChecked, noSwipe) checked:InsetPoints(frame.Panel) frame.checked = checked end - frame.checked:SetTexture(SV.BaseTexture) - frame.checked:SetVertexColor(0, 0.5, 0, 0.2) + frame.checked:SetTexture(0, 0.5, 0, 0.2) frame:SetCheckedTexture(frame.checked) end @@ -1080,10 +1079,10 @@ MOD.Methods["Icon"] = function(self, frame, inverse, ...) self:APPLY(frame, "Icon", underlay, ...) end; -MOD.Methods["DockButton"] = function(self, frame, inverse) +MOD.Methods["DockButton"] = function(self, frame, inverse, template) if(not frame or (frame and frame.Panel)) then return end - - self:APPLY(frame, "DockButton", inverse) + template = template or "DockButton" + self:APPLY(frame, template, inverse) self:FLASH(frame) if(frame.Left) then diff --git a/SVUI_ActionBars/SVUI_ActionBars.lua b/SVUI_ActionBars/SVUI_ActionBars.lua index c9c38ab..8d41fd3 100644 --- a/SVUI_ActionBars/SVUI_ActionBars.lua +++ b/SVUI_ActionBars/SVUI_ActionBars.lua @@ -1192,6 +1192,7 @@ do local auto = _G[name.."AutoCastable"] local shine = _G[name.."Shine"] local checked = button:GetCheckedTexture() + local isChecked = button:GetChecked() local actionName, subtext, actionIcon, isToken, isActive, autoCastAllowed, autoCastEnabled = GetPetActionInfo(i) button:SetChecked(false) button:SetBackdropBorderColor(0, 0, 0) @@ -1215,7 +1216,7 @@ do else auto:Hide() end - if (isActive and actionName ~= "PET_ACTION_FOLLOW") then + if (isActive and isChecked and actionName ~= "PET_ACTION_FOLLOW") then button:SetChecked(true) checked:SetAlpha(1) button:SetBackdropBorderColor(0.4, 0.8, 0) diff --git a/SVUI_ActionBars/components/totem.lua b/SVUI_ActionBars/components/totem.lua index 6ef9324..2cfeefa 100644 --- a/SVUI_ActionBars/components/totem.lua +++ b/SVUI_ActionBars/components/totem.lua @@ -46,24 +46,26 @@ TOTEMS ]]-- local Totems = CreateFrame("Frame", "SVUI_TotemBar", UIParent); -function Totems:Refresh() +function Totems:Refresh() for i = 1, MAX_TOTEMS do - if self[i] then - local haveTotem, name, start, duration, icon = GetTotemInfo(i) - if(haveTotem and icon and icon ~= "") then - self[i]:Show() - self[i].Icon:SetTexture(icon) - CooldownFrame_SetTimer(self[i].CD, start, duration, 1) - local id = self[i]:GetID() - local blizztotem = _G["TotemFrameTotem"..id] - if(blizztotem) then - blizztotem:ClearAllPoints() - blizztotem:SetParent(self[i].Anchor) - blizztotem:SetAllPoints(self[i].Anchor) - end - else - self[i]:Hide() + local slot = TOTEM_PRIORITIES[i] + local haveTotem, name, start, duration, icon = GetTotemInfo(slot) + local svuitotem = _G["SVUI_TotemBarTotem"..slot] + if(haveTotem) then + svuitotem:Show() + svuitotem.Icon:SetTexture(icon) + CooldownFrame_SetTimer(svuitotem.CD, start, duration, 1) + local blizztotem = _G["TotemFrameTotem"..slot] + local tslot = blizztotem.slot + if(tslot and tslot > 0) then + local anchor = _G["SVUI_TotemBarTotem"..tslot] + blizztotem:ClearAllPoints() + blizztotem:SetAllPoints(anchor) + blizztotem:SetFrameStrata(anchor:GetFrameStrata()) + blizztotem:SetFrameLevel(anchor:GetFrameLevel() + 99) end + else + svuitotem:Hide() end end end @@ -122,28 +124,31 @@ function Totems:Update() self:Refresh() end -local Totems_OnEvent = function(self, event) - self:Refresh() -end - -local Totem_OnEnter = function(self) +local Totems_OnEnter = function(self) if(not self:IsVisible()) then return end GameTooltip:SetOwner(self, 'ANCHOR_BOTTOMRIGHT') GameTooltip:SetTotem(self:GetID()) end -local Totem_OnLeave = function() +local Totems_OnLeave = function() GameTooltip:Hide() end +local Totems_OnEvent = function(self, event, ...) + self:Refresh() +end + local _hook_TotemFrame_OnUpdate = function() for i=1, MAX_TOTEMS do - local id = TOTEM_PRIORITIES[i] - local blizztotem = _G["TotemFrameTotem"..id] - local slot = blizztotem.slot - if(slot and slot > 0) then + local slot = TOTEM_PRIORITIES[i] + local blizztotem = _G["TotemFrameTotem"..slot] + local tslot = blizztotem.slot + if(tslot and tslot > 0) then + local anchor = _G["SVUI_TotemBarTotem"..tslot] blizztotem:ClearAllPoints() - blizztotem:SetAllPoints(_G["SVUI_TotemBarTotem"..id]) + blizztotem:SetAllPoints(anchor) + blizztotem:SetFrameStrata(anchor:GetFrameStrata()) + blizztotem:SetFrameLevel(anchor:GetFrameLevel() + 99) end end end @@ -156,45 +161,34 @@ function MOD:InitializeTotemBar() Totems:SetPoint("BOTTOMLEFT", SV.Screen, "BOTTOMLEFT", xOffset, 40) for i = 1, MAX_TOTEMS do - local id = TOTEM_PRIORITIES[i] - local totem = CreateFrame("Button", "SVUI_TotemBarTotem"..id, Totems) - totem:SetID(id) + local slot = TOTEM_PRIORITIES[i] + local totem = CreateFrame("Button", "SVUI_TotemBarTotem"..slot, Totems) + totem:SetFrameStrata("BACKGROUND") + totem:SetID(slot) + totem:SetStyle("Frame", "Icon") totem:Hide() totem.Icon = totem:CreateTexture(nil, "ARTWORK") totem.Icon:InsetPoints() totem.Icon:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) - totem.CD = CreateFrame("Cooldown", "SVUI_TotemBarTotem"..id.."Cooldown", totem, "CooldownFrameTemplate") + totem.CD = CreateFrame("Cooldown", "SVUI_TotemBarTotem"..slot.."Cooldown", totem, "CooldownFrameTemplate") totem.CD:SetReverse(true) totem.Anchor = CreateFrame("Frame", nil, totem) totem.Anchor:SetAllPoints() - totem:SetStyle("ActionSlot") - - totem:EnableMouse(true) - totem:SetScript('OnEnter', Totem_OnEnter) - totem:SetScript('OnLeave', Totem_OnLeave) - - local blizztotem = _G["TotemFrameTotem"..id] - if(blizztotem) then - blizztotem:ClearAllPoints() - blizztotem:SetParent(totem.Anchor) - blizztotem:SetAllPoints(totem.Anchor) - blizztotem:SetFrameLevel(totem.Anchor:GetFrameLevel() + 1) - blizztotem:SetFrameStrata(totem.Anchor:GetFrameStrata()) - blizztotem:SetAlpha(0) - end - Totems[i] = totem - end + end + Totems:Show() + TotemFrame:Show() + TotemFrame.Hide = TotemFrame.Show hooksecurefunc("TotemFrame_Update", _hook_TotemFrame_OnUpdate) - Totems:Show() Totems:RegisterEvent("PLAYER_TOTEM_UPDATE") Totems:RegisterEvent("PLAYER_ENTERING_WORLD") Totems:SetScript("OnEvent", Totems_OnEvent) + Totems:Update() SV:NewAnchor(Totems, MOVER_NAME) diff --git a/SVUI_QuestTracker/components/active.lua b/SVUI_QuestTracker/components/active.lua index 2c2118a..c71c7b4 100644 --- a/SVUI_QuestTracker/components/active.lua +++ b/SVUI_QuestTracker/components/active.lua @@ -356,8 +356,8 @@ function MOD:InitializeActive() block.Button = CreateFrame("Button", nil, block) block.Button:ModPoint("TOPLEFT", block, "TOPLEFT", 0, 0); block.Button:ModPoint("BOTTOMRIGHT", block, "BOTTOMRIGHT", 0, 8); - block.Button:SetStyle("DockButton") - block.Button:SetPanelColor("gold") + block.Button:SetStyle("DockButton", "Transparent") + block.Button:SetBackdropBorderColor(0, 0.9, 0, 0.5) block.Button:SetID(0) block.Button.Parent = active; block.Button:SetScript("OnClick", ViewButton_OnClick) diff --git a/SVUI_QuestTracker/components/quests.lua b/SVUI_QuestTracker/components/quests.lua index ffe8ca0..09131e8 100644 --- a/SVUI_QuestTracker/components/quests.lua +++ b/SVUI_QuestTracker/components/quests.lua @@ -803,7 +803,9 @@ local GetQuestRow = function(self, index) row.Header.Zone:SetText("") row.Button = CreateFrame("Button", nil, row.Header) - row.Button:SetAllPoints(row.Header); + row.Button:SetPoint("TOPLEFT", row, "TOPLEFT", (QUEST_ROW_HEIGHT + 6), 0); + row.Button:SetPoint("TOPRIGHT", row, "TOPRIGHT", -2, 0); + row.Button:ModHeight(INNER_HEIGHT + 2); row.Button:SetStyle("LiteButton") row.Button:SetID(0) row.Button:RegisterForClicks("LeftButtonUp", "RightButtonUp") diff --git a/SVUI_Skins/components/blizzard/quest.lua b/SVUI_Skins/components/blizzard/quest.lua index 620140f..d8788b9 100644 --- a/SVUI_Skins/components/blizzard/quest.lua +++ b/SVUI_Skins/components/blizzard/quest.lua @@ -76,6 +76,8 @@ end local Hook_QuestInfoItem_OnClick = function(self) _G.QuestInfoItemHighlight:ClearAllPoints() _G.QuestInfoItemHighlight:SetAllPoints(self) + _G.QuestInfoItemHighlight:Show() + print('_G.QuestInfoItemHighlight:') end local Hook_QuestNPCModel = function(self, _, _, _, x, y) @@ -118,6 +120,17 @@ local function QuestFrameStyle() QuestLogPopupDetailFrameScrollFrame:RemoveTextures() QuestProgressScrollFrame:RemoveTextures() + + QuestInfoItemHighlight:RemoveTextures() + QuestInfoItemHighlight:SetStyle("Frame", "Icon") + QuestInfoItemHighlight:ModSize(148, 40) + + local choiceBG = QuestInfoItemHighlight:CreateTexture(nil, "BACKGROUND") + choiceBG:SetPoint("CENTER", QuestInfoItemHighlight, "CENTER", 0, 0) + choiceBG:ModSize(148, 40) + choiceBG:SetTexture(0.35, 1, 0, 0.35) + + --QuestInfoItemHighlight:ModSize(142, 40) local width = QuestLogPopupDetailFrameScrollFrame:GetWidth() QuestLogPopupDetailFrame.ShowMapButton:SetWidth(width) @@ -165,11 +178,6 @@ local function QuestFrameStyle() QuestInfoSkillPointFrameIconTexture:SetPoint("TOPLEFT", 2, -2) QuestInfoSkillPointFrameIconTexture:ModSize(QuestInfoSkillPointFrameIconTexture:GetWidth()-2, QuestInfoSkillPointFrameIconTexture:GetHeight()-2) QuestInfoSkillPointFrameCount:SetDrawLayer("OVERLAY") - QuestInfoItemHighlight:RemoveTextures() - QuestInfoItemHighlight:SetStyle("!_Frame", "Icon") - QuestInfoItemHighlight:SetBackdropBorderColor(1, 1, 0) - QuestInfoItemHighlight:SetBackdropColor(0, 0, 0, 0) - QuestInfoItemHighlight:ModSize(142, 40) hooksecurefunc("QuestInfoItem_OnClick", Hook_QuestInfoItem_OnClick) hooksecurefunc("QuestInfo_Display", StyleQuestRewards) diff --git a/SVUI_UnitFrames/SVUI_UnitFrames.lua b/SVUI_UnitFrames/SVUI_UnitFrames.lua index a434fa4..24bb9e9 100644 --- a/SVUI_UnitFrames/SVUI_UnitFrames.lua +++ b/SVUI_UnitFrames/SVUI_UnitFrames.lua @@ -128,13 +128,19 @@ do if (not unit) or InCombatLockdown() then return end if (unit == "player") then - deactivate(PlayerFrame) + PlayerFrame:UnregisterAllEvents() + PlayerFrame:SetAlpha(0) + --PlayerFrame:Hide() + PlayerFrame:EnableMouse(false) + if PlayerFrame.healthbar then PlayerFrame.healthbar:UnregisterAllEvents() end + if PlayerFrame.manabar then PlayerFrame.manabar:UnregisterAllEvents() end + if PlayerFrame.spellbar then PlayerFrame.spellbar:UnregisterAllEvents() end + if PlayerFrame.powerBarAlt then PlayerFrame.powerBarAlt:UnregisterAllEvents() end PlayerFrame:RegisterUnitEvent("UNIT_ENTERING_VEHICLE", "player") PlayerFrame:RegisterUnitEvent("UNIT_ENTERED_VEHICLE", "player") PlayerFrame:RegisterUnitEvent("UNIT_EXITING_VEHICLE", "player") PlayerFrame:RegisterUnitEvent("UNIT_EXITED_VEHICLE", "player") PlayerFrame:RegisterEvent("PLAYER_ENTERING_WORLD") - PlayerFrame:SetUserPlaced(true) PlayerFrame:SetDontSavePosition(true) RuneFrame:SetParent(PlayerFrame) diff --git a/SVUI_UnitFrames/class_resources/shaman.lua b/SVUI_UnitFrames/class_resources/shaman.lua index ef8363a..523b82f 100644 --- a/SVUI_UnitFrames/class_resources/shaman.lua +++ b/SVUI_UnitFrames/class_resources/shaman.lua @@ -105,6 +105,7 @@ function MOD:CreateClassBar(playerFrame) bar[i].backdrop:SetTexture(iconfile) bar[i].backdrop:SetDesaturated(true) bar[i].backdrop:SetVertexColor(0.2,0.2,0.2,0.7) + bar[i]:EnableMouse(true) end local classBarHolder = CreateFrame("Frame", "Player_ClassBar", bar) diff --git a/SVUI_UnitFrames/libs/Plugins/oUF_TotemBars/oUF_TotemBars.lua b/SVUI_UnitFrames/libs/Plugins/oUF_TotemBars/oUF_TotemBars.lua index 81a911a..12e78da 100644 --- a/SVUI_UnitFrames/libs/Plugins/oUF_TotemBars/oUF_TotemBars.lua +++ b/SVUI_UnitFrames/libs/Plugins/oUF_TotemBars/oUF_TotemBars.lua @@ -102,14 +102,6 @@ local Enable = function(self) self:RegisterEvent('PLAYER_TOTEM_UPDATE', Path, true) - TotemFrame.Show = TotemFrame.Hide - TotemFrame:Hide() - - TotemFrame:UnregisterEvent("PLAYER_TOTEM_UPDATE") - TotemFrame:UnregisterEvent("PLAYER_ENTERING_WORLD") - TotemFrame:UnregisterEvent("UPDATE_SHAPESHIFT_FORM") - TotemFrame:UnregisterEvent("PLAYER_TALENT_UPDATE") - return true end end @@ -119,13 +111,6 @@ local Disable = function(self) for i = 1, MAX_TOTEMS do self.TotemBars[i]:Hide() end - TotemFrame.Show = nil - TotemFrame:Show() - - TotemFrame:RegisterEvent("PLAYER_TOTEM_UPDATE") - TotemFrame:RegisterEvent("PLAYER_ENTERING_WORLD") - TotemFrame:RegisterEvent("UPDATE_SHAPESHIFT_FORM") - TotemFrame:RegisterEvent("PLAYER_TALENT_UPDATE") self:UnregisterEvent('PLAYER_TOTEM_UPDATE', Path) end