From 5c241a26be163ab884cc616c83c00dd6a523a636 Mon Sep 17 00:00:00 2001 From: Steven Jackson Date: Thu, 16 Oct 2014 00:26:13 -0500 Subject: [PATCH] fix --- Interface/AddOns/SVUI/packages/map/SVMap.lua | 8 +- .../SVUI_StyleOMatic/components/blizzard/quest.lua | 127 +++++++++----------- .../components/blizzard/worldmap.lua | 9 +- 3 files changed, 64 insertions(+), 80 deletions(-) diff --git a/Interface/AddOns/SVUI/packages/map/SVMap.lua b/Interface/AddOns/SVUI/packages/map/SVMap.lua index 3a4db7b..70e6cb3 100644 --- a/Interface/AddOns/SVUI/packages/map/SVMap.lua +++ b/Interface/AddOns/SVUI/packages/map/SVMap.lua @@ -651,10 +651,8 @@ function MOD:ADDON_LOADED(event, addon) end function MOD:PLAYER_REGEN_ENABLED() - if(WorldMapFrame:IsShown()) then - WorldMapFrameSizeDownButton:Enable() - WorldMapFrameSizeUpButton:Enable() - end + WorldMapFrameSizeDownButton:Enable() + WorldMapFrameSizeUpButton:Enable() if(self.CombatLocked) then self:RefreshMiniMap() self.CombatLocked = nil @@ -861,7 +859,7 @@ function MOD:Load() CoordsHolder.mouseCoords:SetTextColor(1,1,0) CoordsHolder.playerCoords:SetFontObject(NumberFontNormal) CoordsHolder.mouseCoords:SetFontObject(NumberFontNormal) - CoordsHolder.playerCoords:SetPoint("BOTTOMLEFT",WorldMapDetailFrame,"BOTTOMLEFT",5,5) + CoordsHolder.playerCoords:SetPoint("BOTTOMLEFT",WorldMapFrame,"BOTTOMLEFT",5,5) CoordsHolder.playerCoords:SetText(PLAYER..": 0, 0") CoordsHolder.mouseCoords:SetPoint("BOTTOMLEFT",CoordsHolder.playerCoords,"TOPLEFT",0,5) CoordsHolder.mouseCoords:SetText(MOUSE_LABEL..": 0, 0") diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/quest.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/quest.lua index 665ad9d..658766d 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/quest.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/quest.lua @@ -32,11 +32,12 @@ HELPERS ########################################################## ]]-- local QuestFrameList = { - "QuestLogFrameAbandonButton", - "QuestLogFramePushQuestButton", - "QuestLogFrameTrackButton", - "QuestLogFrameCancelButton", - "QuestLogFrameCompleteButton" + "QuestLogPopupDetailFrame", + "QuestLogPopupDetailFrameAbandonButton", + "QuestLogPopupDetailFrameShareButton", + "QuestLogPopupDetailFrameTrackButton", + "QuestLogPopupDetailFrameCancelButton", + "QuestLogPopupDetailFrameCompleteButton" }; local function QuestScrollHelper(b, c, d, e) @@ -50,26 +51,6 @@ local function QuestScrollHelper(b, c, d, e) end b.spellTex:Size(c or 506, d or 615) b.spellTex:SetTexCoord(0, 1, 0.02, 1) -end - -local function QueuedWatchFrameItems() - local WATCHFRAME_NUM_ITEMS = _G.WATCHFRAME_NUM_ITEMS - if(not WATCHFRAME_NUM_ITEMS) then return end; - for i=1, WATCHFRAME_NUM_ITEMS do - local button = _G["WatchFrameItem"..i] - local point, relativeTo, relativePoint, xOffset, yOffset = button:GetPoint(1) - button:SetFrameStrata("LOW") - button:SetPoint("TOPRIGHT", relativeTo, "TOPLEFT", -30, -2); - if not button.styled then - button:SetSlotTemplate() - button:SetBackdropColor(0,0,0,0) - _G["WatchFrameItem"..i.."NormalTexture"]:SetAlpha(0) - _G["WatchFrameItem"..i.."IconTexture"]:FillInner() - _G["WatchFrameItem"..i.."IconTexture"]:SetTexCoord(0.1,0.9,0.1,0.9) - SV.Timers:AddCooldown(_G["WatchFrameItem"..i.."Cooldown"]) - button.styled = true - end - end end local QuestRewardScrollFrame_OnShow = function(self) @@ -87,7 +68,7 @@ local Hook_QuestInfo_Display = function(self, ...) local MAX_NUM_ITEMS = _G.MAX_NUM_ITEMS if(not MAX_NUM_ITEMS) then return end; for i = 1, MAX_NUM_ITEMS do - local name = ("QuestInfoItem%d"):format(i) + local name = ("QuestInfoRewardsFrameQuestInfoItem%d"):format(i) local item = _G[name] if(item and item:IsShown()) then local initialAnchor, anchorParent, relativeAnchor, xPosition, yPosition = item:GetPoint() @@ -98,7 +79,23 @@ local Hook_QuestInfo_Display = function(self, ...) else item:Point(initialAnchor, anchorParent, relativeAnchor, 4, 0) end - end + if(not item.isStyled) then + local cLvl = item:GetFrameLevel() + 1 + item:RemoveTextures() + item:Width(item:GetWidth() - 4) + item:SetFrameLevel(cLvl) + STYLE:ApplyItemButtonStyle(item, false, true) + item.isStyled = true + end + local tex = _G["QuestInfoRewardsFrameQuestInfoItem"..i.."IconTexture"] + if(tex) then + tex:SetTexCoord(0.1, 0.9, 0.1, 0.9) + tex:SetDrawLayer("OVERLAY",1) + tex:SetPoint("TOPLEFT", 2, -2) + tex:Size(tex:GetWidth() - 2, tex:GetHeight() - 2) + tex:SetParent(item.Panel) + end + end end end @@ -127,18 +124,18 @@ local _hook_DetailScrollShow = function(self) self.spellTex:Height(self:GetHeight() + 217) end -local _hook_QuestLogFrameShow = function(self) - local QuestLogScrollFrame = _G.QuestLogScrollFrame; - if not QuestLogScrollFrame.spellTex then - QuestLogScrollFrame:SetFixedPanelTemplate("Default") - QuestLogScrollFrame.spellTex = QuestLogScrollFrame:CreateTexture(nil, 'ARTWORK') - QuestLogScrollFrame.spellTex:SetTexture([[Interface\QuestFrame\QuestBookBG]]) - QuestLogScrollFrame.spellTex:SetPoint("TOPLEFT", 2, -2) - QuestLogScrollFrame.spellTex:Size(514, 616) - QuestLogScrollFrame.spellTex:SetTexCoord(0, 1, 0.02, 1) - QuestLogScrollFrame.spellTex2 = QuestLogScrollFrame:CreateTexture(nil, 'BORDER') - QuestLogScrollFrame.spellTex2:SetTexture([[Interface\FrameGeneral\UI-Background-Rock]]) - QuestLogScrollFrame.spellTex2:FillInner() +local _hook_QuestLogPopupDetailFrameShow = function(self) + local QuestLogPopupDetailFrameScrollFrame = _G.QuestLogPopupDetailFrameScrollFrame; + if not QuestLogPopupDetailFrameScrollFrame.spellTex then + QuestLogPopupDetailFrameScrollFrame:SetFixedPanelTemplate("Default") + QuestLogPopupDetailFrameScrollFrame.spellTex = QuestLogPopupDetailFrameScrollFrame:CreateTexture(nil, 'ARTWORK') + QuestLogPopupDetailFrameScrollFrame.spellTex:SetTexture([[Interface\QuestFrame\QuestBookBG]]) + QuestLogPopupDetailFrameScrollFrame.spellTex:SetPoint("TOPLEFT", 2, -2) + QuestLogPopupDetailFrameScrollFrame.spellTex:Size(514, 616) + QuestLogPopupDetailFrameScrollFrame.spellTex:SetTexCoord(0, 1, 0.02, 1) + QuestLogPopupDetailFrameScrollFrame.spellTex2 = QuestLogPopupDetailFrameScrollFrame:CreateTexture(nil, 'BORDER') + QuestLogPopupDetailFrameScrollFrame.spellTex2:SetTexture([[Interface\FrameGeneral\UI-Background-Rock]]) + QuestLogPopupDetailFrameScrollFrame.spellTex2:FillInner() end end --[[ @@ -156,66 +153,54 @@ end local function QuestFrameStyle() if SV.db[Schema].blizzard.enable ~= true or SV.db[Schema].blizzard.quest ~= true then return end + STYLE:ApplyWindowStyle(QuestLogPopupDetailFrame, true, true) STYLE:ApplyWindowStyle(QuestFrame, true, true) - --[[ THIS SECTION NOT WORKING IN WOD ]]-- - if(SV.GameVersion < 60000) then - QuestLogScrollFrame:RemoveTextures() - QuestLogCount:RemoveTextures() - EmptyQuestLogFrame:RemoveTextures() - QuestProgressScrollFrame:RemoveTextures() - QuestLogFrameShowMapButton:RemoveTextures() - QuestLogFrameCompleteButton:RemoveTextures() - - STYLE:ApplyWindowStyle(QuestLogFrame) - QuestLogCount:SetFixedPanelTemplate("Default") + QuestLogPopupDetailFrameScrollFrame:RemoveTextures() + QuestProgressScrollFrame:RemoveTextures() + local width = QuestLogPopupDetailFrameScrollFrame:GetWidth() + QuestLogPopupDetailFrame.ShowMapButton:SetWidth(width) + QuestLogPopupDetailFrame.ShowMapButton:SetButtonTemplate() - QuestLogDetailFrameInset:Die() - QuestLogFrameInset:Die() + STYLE:ApplyWindowStyle(QuestLogPopupDetailFrame) - QuestLogFrameShowMapButton:SetButtonTemplate() - QuestLogFrameShowMapButton.text:ClearAllPoints() - QuestLogFrameShowMapButton.text:SetPoint("CENTER") + QuestLogPopupDetailFrameInset:Die() - for _,i in pairs(QuestFrameList)do + for _,i in pairs(QuestFrameList)do + if(_G[i]) then _G[i]:SetButtonTemplate() _G[i]:SetFrameLevel(_G[i]:GetFrameLevel() + 2) end - - QuestLogFramePushQuestButton:Point("LEFT", QuestLogFrameAbandonButton, "RIGHT", 2, 0) - QuestLogFramePushQuestButton:Point("RIGHT", QuestLogFrameTrackButton, "LEFT", -2, 0) - QuestLogDetailScrollFrame:HookScript('OnShow', _hook_DetailScrollShow) - QuestLogFrame:HookScript("OnShow", _hook_QuestLogFrameShow) end - --[[ ############################### ]]-- + QuestLogPopupDetailFrameScrollFrame:HookScript('OnShow', _hook_DetailScrollShow) + QuestLogPopupDetailFrame:HookScript("OnShow", _hook_QuestLogPopupDetailFrameShow) - STYLE:ApplyCloseButtonStyle(QuestLogFrameCloseButton) - STYLE:ApplyScrollFrameStyle(QuestLogDetailScrollFrameScrollBar) - STYLE:ApplyScrollFrameStyle(QuestLogScrollFrameScrollBar, 5) - STYLE:ApplyScrollFrameStyle(QuestProgressScrollFrameScrollBar) + STYLE:ApplyCloseButtonStyle(QuestLogPopupDetailFrameCloseButton) + STYLE:ApplyScrollFrameStyle(QuestLogPopupDetailFrameScrollFrameScrollBar, 5) STYLE:ApplyScrollFrameStyle(QuestRewardScrollFrameScrollBar) QuestGreetingScrollFrame:RemoveTextures() STYLE:ApplyScrollFrameStyle(QuestGreetingScrollFrameScrollBar) for i = 1, MAX_NUM_ITEMS do - local item = _G["QuestInfoItem"..i] - if(item) then + local item = _G["QuestInfoRewardsFrameQuestInfoItem"..i] + if(item and not item.isStyled) then local cLvl = item:GetFrameLevel() + 1 item:RemoveTextures() item:Width(item:GetWidth() - 4) item:SetFrameLevel(cLvl) - local tex = _G["QuestInfoItem"..i.."IconTexture"] + local tex = _G["QuestInfoRewardsFrameQuestInfoItem"..i.."IconTexture"] if(tex) then tex:SetTexCoord(0.1, 0.9, 0.1, 0.9) tex:SetDrawLayer("OVERLAY",1) tex:SetPoint("TOPLEFT", 2, -2) tex:Size(tex:GetWidth() - 2, tex:GetHeight() - 2) end - STYLE:ApplyItemButtonStyle(item) + STYLE:ApplyItemButtonStyle(item, false, true) + item.isStyled = true end - end + end QuestInfoSkillPointFrame:RemoveTextures() QuestInfoSkillPointFrame:Width(QuestInfoSkillPointFrame:GetWidth() - 4) diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/worldmap.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/worldmap.lua index 676ab2f..a49d8ef 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/worldmap.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/worldmap.lua @@ -47,9 +47,10 @@ end local function WorldMap_FullView() local WorldMapFrame = _G.WorldMapFrame; WorldMapFrame.Panel:ClearAllPoints() - WorldMapFrame.Panel:Point("TOPLEFT", WorldMapDetailFrame, "TOPLEFT", -12, 74) - WorldMapFrame.Panel:Point("BOTTOMRIGHT", WorldMapDetailFrame, "BOTTOMRIGHT", 12, -24) - WorldMapFrame.Panel.Panel:SetAllPoints(SV.UIParent) + local w, h = WorldMapDetailFrame:GetSize() + WorldMapFrame.Panel:Size(w + 24, h + 98) + WorldMapFrame.Panel:Point("TOP", WorldMapFrame, "TOP", 0, 0) + WorldMapFrame.Panel.Panel:WrapOuter(WorldMapFrame.Panel) end local function StripQuestMapFrame() @@ -121,7 +122,7 @@ local function WorldMap_OnShow() elseif WORLDMAP_SETTINGS.size == WORLDMAP_WINDOWED_SIZE then WorldMap_SmallView() end - + -- WorldMap_SmallView() if not SV.db.SVMap.tinyWorldMap then BlackoutWorld:SetTexture(0,0,0,1) else -- 1.7.9.5