diff --git a/SVUI_Skins/components/blizzard/misc.lua b/SVUI_Skins/components/blizzard/misc.lua index 213fd0f..8674df2 100644 --- a/SVUI_Skins/components/blizzard/misc.lua +++ b/SVUI_Skins/components/blizzard/misc.lua @@ -657,18 +657,18 @@ local function MiscStyles() TabardCharacterModelRotateLeftButton:SetPoint("BOTTOMLEFT", 4, 4) TabardCharacterModelRotateRightButton:SetPoint("TOPLEFT", TabardCharacterModelRotateLeftButton, "TOPRIGHT", 4, 0) - hooksecurefunc(TabardCharacterModelRotateLeftButton, "SetPoint", function(self, p1, a, p2, x, y) - if((p1 ~= "BOTTOMLEFT") or (x ~= 4) or (y ~= 4)) then - self:SetPoint("BOTTOMLEFT", 4, 4) - end - end) - - hooksecurefunc(TabardCharacterModelRotateRightButton, "SetPoint", function(self, p1, a, p2, x, y) - local anchor = _G.TabardCharacterModelRotateLeftButton - if((anchor) and ((p1 ~= "TOPLEFT") or (x ~= 4) or (y ~= 0))) then - self:SetPoint("TOPLEFT", anchor, "TOPRIGHT", 4, 0) - end - end) + -- hooksecurefunc(TabardCharacterModelRotateLeftButton, "SetPoint", function(self, p1, a, p2, x, y) + -- if((p1 ~= "BOTTOMLEFT") or (x ~= 4) or (y ~= 4)) then + -- self:SetPoint("BOTTOMLEFT", 4, 4) + -- end + -- end) + + -- hooksecurefunc(TabardCharacterModelRotateRightButton, "SetPoint", function(self, p1, a, p2, x, y) + -- local anchor = _G.TabardCharacterModelRotateLeftButton + -- if((anchor) and ((p1 ~= "TOPLEFT") or (x ~= 4) or (y ~= 0))) then + -- self:SetPoint("TOPLEFT", anchor, "TOPRIGHT", 4, 0) + -- end + -- end) end if(SV.db.Skins.blizzard.taxi) then diff --git a/SVUI_Skins/components/blizzard/quest.lua b/SVUI_Skins/components/blizzard/quest.lua index 5ef3503..cd48e45 100644 --- a/SVUI_Skins/components/blizzard/quest.lua +++ b/SVUI_Skins/components/blizzard/quest.lua @@ -45,7 +45,7 @@ end local QuestRewardScrollFrame_OnShow = function(self) if(not self.Panel) then - self:SetStyle("Frame", "Default") + SV.API:Set("Frame", self) QuestScrollHelper(self, 509, 630, false) self:SetHeight(self:GetHeight() - 2) end @@ -120,8 +120,23 @@ local function QuestFrameStyle() SV.API:Set("Window", QuestLogPopupDetailFrame, true, true) SV.API:Set("Window", QuestFrame, true, true) - QuestLogPopupDetailFrameScrollFrameScrollBar:RemoveTextures() - QuestProgressScrollFrameScrollBar:RemoveTextures() + QuestLogPopupDetailFrameScrollFrameScrollBar:RemoveTextures(true) + QuestProgressScrollFrameScrollBar:RemoveTextures(true) + QuestDetailScrollFrameScrollBar:RemoveTextures(true) + QuestDetailScrollChildFrame:RemoveTextures(true) + QuestRewardScrollFrameScrollBar:RemoveTextures(true) + QuestRewardScrollChildFrame:RemoveTextures(true) + QuestFrameProgressPanel:RemoveTextures(true) + QuestFrameRewardPanel:RemoveTextures(true) + QuestGreetingScrollFrameScrollBar:RemoveTextures(true) + QuestDetailScrollFrameScrollBar:RemoveTextures(true) + + QuestScrollHelper(QuestDetailScrollFrame, 506, 615, true) + QuestDetailScrollFrameScrollBar:SetStyle("!_Frame") + QuestScrollHelper(QuestProgressScrollFrame, 506, 615, true) + QuestProgressScrollFrameScrollBar:SetStyle("!_Frame") + QuestScrollHelper(QuestGreetingScrollFrame, 506, 615, true) + QuestGreetingScrollFrameScrollBar:SetStyle("!_Frame") QuestInfoItemHighlight:RemoveTextures() QuestInfoItemHighlight:SetStyle("Frame", "Icon") @@ -149,11 +164,6 @@ local function QuestFrameStyle() QuestLogPopupDetailFrame:HookScript("OnShow", _hook_QuestLogPopupDetailFrameShow) SV.API:Set("CloseButton", QuestLogPopupDetailFrameCloseButton) - SV.API:Set("ScrollBar", QuestLogPopupDetailFrameScrollFrame, 5) - SV.API:Set("ScrollBar", QuestRewardScrollFrame) - - QuestGreetingScrollFrameScrollBar:RemoveTextures() - SV.API:Set("ScrollBar", QuestGreetingScrollFrame) for i = 1, 10 do local name = ("QuestInfoRewardsFrameQuestInfoItem%d"):format(i) @@ -185,17 +195,7 @@ local function QuestFrameStyle() QuestFrameInset:Die() QuestFrameDetailPanel:RemoveTextures(true) - QuestDetailScrollFrameScrollBar:RemoveTextures(true) - QuestScrollHelper(QuestDetailScrollFrameScrollBar, 506, 615, true) - QuestProgressScrollFrameScrollBar:SetStyle("!_Frame") - QuestScrollHelper(QuestProgressScrollFrameScrollBar, 506, 615, true) - QuestGreetingScrollFrameScrollBar:SetStyle("!_Frame") - QuestScrollHelper(QuestGreetingScrollFrameScrollBar, 506, 615, true) - QuestDetailScrollChildFrame:RemoveTextures(true) - QuestRewardScrollFrameScrollBar:RemoveTextures(true) - QuestRewardScrollChildFrame:RemoveTextures(true) - QuestFrameProgressPanel:RemoveTextures(true) - QuestFrameRewardPanel:RemoveTextures(true) + QuestFrameAcceptButton:SetStyle("Button") QuestFrameDeclineButton:SetStyle("Button") @@ -225,6 +225,10 @@ local function QuestFrameStyle() QuestNPCModelTextFrame:SetStyle("Frame", "Default") QuestNPCModelTextFrame.Panel:SetPoint("TOPLEFT", QuestNPCModel.Panel, "BOTTOMLEFT", 0, -2) + SV.API:Set("ScrollBar", QuestLogPopupDetailFrameScrollFrame, 5) + SV.API:Set("ScrollBar", QuestRewardScrollFrame) + SV.API:Set("ScrollBar", QuestGreetingScrollFrame) + hooksecurefunc("QuestFrame_ShowQuestPortrait", Hook_QuestNPCModel) hooksecurefunc("QuestFrame_SetTitleTextColor", Hook_QuestFrame_SetTitleTextColor)