diff --git a/SVUI_!Core/system/dock.lua b/SVUI_!Core/system/dock.lua index 8a686fd..14bfac9 100644 --- a/SVUI_!Core/system/dock.lua +++ b/SVUI_!Core/system/dock.lua @@ -602,7 +602,9 @@ local DockBar_SetDefault = function(self, button, isAdvanced) elseif(button.FrameLink) then ResetAllDockletWindows(self, button); self.Parent.Window.FrameLink = button.FrameLink; - self.Parent.Window:Show(); + if(not InCombatLockdown()) then + self.Parent.Window:Show(); + end self.Parent.Window:FadeIn(); if(ShowDockletWindow(button, location)) then self.Parent.backdrop:Show(); @@ -623,7 +625,9 @@ local DockBar_NextDefault = function(self) MOD.private.DefaultDocklets[location] = name; ResetAllDockletWindows(self, button); self.Parent.Window.FrameLink = button.FrameLink; - self.Parent.Window:Show(); + if(not InCombatLockdown()) then + self.Parent.Window:Show(); + end self.Parent.Window:FadeIn(); if(ShowDockletWindow(button, location)) then self.Parent.backdrop:Show(); diff --git a/SVUI_!Core/system/dropdown.lua b/SVUI_!Core/system/dropdown.lua index d59dc2b..bccb9d6 100644 --- a/SVUI_!Core/system/dropdown.lua +++ b/SVUI_!Core/system/dropdown.lua @@ -1,7 +1,7 @@ --[[ ########################################################## S V U I By: Munglunch -########################################################## +########################################################## LOCALIZED LUA FUNCTIONS ########################################################## ]]-- @@ -27,7 +27,7 @@ local find = string.find; local match = string.match; local gsub = string.gsub; --TABLE -local table = _G.table; +local table = _G.table; local tinsert = _G.tinsert; local tremove = _G.tremove; local twipe = _G.wipe; @@ -39,8 +39,8 @@ local ceil = math.ceil --BLIZZARD API local InCombatLockdown = _G.InCombatLockdown; local CreateFrame = _G.CreateFrame; ---[[ -########################################################## +--[[ +########################################################## ADDON ########################################################## ]]-- @@ -69,33 +69,33 @@ local function GetScreenPosition(frame) local screenWidth = GetScreenWidth() local screenHeight = GetScreenHeight() local result; - if not centerX or not centerY then + if not centerX or not centerY then return "CENTER" - end + end local heightTop = screenHeight * 0.75; local heightBottom = screenHeight * 0.25; local widthLeft = screenWidth * 0.25; local widthRight = screenWidth * 0.75; - if(((centerX > widthLeft) and (centerX < widthRight)) and (centerY > heightTop)) then + if(((centerX > widthLeft) and (centerX < widthRight)) and (centerY > heightTop)) then result = "TOP" - elseif((centerX < widthLeft) and (centerY > heightTop)) then + elseif((centerX < widthLeft) and (centerY > heightTop)) then result = "TOPLEFT" - elseif((centerX > widthRight) and (centerY > heightTop)) then + elseif((centerX > widthRight) and (centerY > heightTop)) then result = "TOPRIGHT" - elseif(((centerX > widthLeft) and (centerX < widthRight)) and centerY < heightBottom) then + elseif(((centerX > widthLeft) and (centerX < widthRight)) and centerY < heightBottom) then result = "BOTTOM" - elseif((centerX < widthLeft) and (centerY < heightBottom)) then + elseif((centerX < widthLeft) and (centerY < heightBottom)) then result = "BOTTOMLEFT" - elseif((centerX > widthRight) and (centerY < heightBottom)) then + elseif((centerX > widthRight) and (centerY < heightBottom)) then result = "BOTTOMRIGHT" - elseif((centerX < widthLeft) and (centerY > heightBottom) and (centerY < heightTop)) then + elseif((centerX < widthLeft) and (centerY > heightBottom) and (centerY < heightTop)) then result = "LEFT" - elseif((centerX > widthRight) and (centerY < heightTop) and (centerY > heightBottom)) then + elseif((centerX > widthRight) and (centerY < heightTop) and (centerY > heightBottom)) then result = "RIGHT" - else + else result = "CENTER" end - return result + return result end function SV.Dropdown:Open(target, list, titleText) @@ -157,7 +157,7 @@ function SV.Dropdown:Open(target, list, titleText) self.option[i].button.text:SetJustifyH("LEFT"); self.option[i].button:SetScript("OnEnter", DropdownButton_OnEnter); - self.option[i].button:SetScript("OnLeave", DropdownButton_OnLeave); + self.option[i].button:SetScript("OnLeave", DropdownButton_OnLeave); end self.option[i]:Show(); @@ -209,7 +209,7 @@ end local function InitializeDropdown() SV.Dropdown:SetParent(SV.Screen) - SV.Dropdown:SetFrameStrata("DIALOG") + SV.Dropdown:SetFrameStrata("FULLSCREEN_DIALOG") SV.Dropdown:SetFrameLevel(99) SV.Dropdown:SetStyle("Frame", "Default") SV.Dropdown.option = {}; @@ -222,7 +222,6 @@ local function InitializeDropdown() SV.Dropdown.Title:SetPoint("TOPLEFT", SV.Dropdown, "TOPLEFT", 7, -7) SV.Dropdown.Title:SetText("Menu") SV.Dropdown.Title:SetTextColor(1, 0.5, 0) - SV.Dropdown:SetFrameStrata("DIALOG"); SV.Dropdown:SetClampedToScreen(true); SV.Dropdown:SetSize(155, 94) @@ -238,4 +237,4 @@ local function InitializeDropdown() SV:ManageVisibility(SV.Dropdown) end -SV.Events:On("LOAD_ALL_WIDGETS", InitializeDropdown); \ No newline at end of file +SV.Events:On("LOAD_ALL_WIDGETS", InitializeDropdown); diff --git a/SVUI_!Core/system/letsride.lua b/SVUI_!Core/system/letsride.lua index 96b33b2..dfeb671 100644 --- a/SVUI_!Core/system/letsride.lua +++ b/SVUI_!Core/system/letsride.lua @@ -1,7 +1,7 @@ --[[ ########################################################## S V U I By: Munglunch -########################################################## +########################################################## LOCALIZED LUA FUNCTIONS ########################################################## ]]-- @@ -16,7 +16,7 @@ local tinsert = _G.tinsert; local table = _G.table; local math = _G.math; local bit = _G.bit; -local random = math.random; +local random = math.random; local twipe,band = table.wipe, bit.band; --BLIZZARD API local CreateFrame = _G.CreateFrame; @@ -38,22 +38,22 @@ local ERR_NOT_IN_COMBAT = _G.ERR_NOT_IN_COMBAT; local RAID_CLASS_COLORS = _G.RAID_CLASS_COLORS; local CUSTOM_CLASS_COLORS = _G.CUSTOM_CLASS_COLORS; local C_MountJournal = _G.C_MountJournal; ---[[ -########################################################## +--[[ +########################################################## GET ADDON DATA ########################################################## ]]-- local SV = select(2, ...); ---[[ -########################################################## +--[[ +########################################################## LOCAL VARIABLES ########################################################## ]]-- local TOOLTIP_SUMMARY = ""; local MountListener = CreateFrame("Frame"); MountListener.favorites = false ---[[ -########################################################## +--[[ +########################################################## LOCAL FUNCTIONS ########################################################## ]]-- @@ -170,10 +170,10 @@ end local function Update_MountCheckButtons() if(not MountJournal or (MountJournal and not MountJournal.cachedMounts)) then return end local count = #MountJournal.cachedMounts - if(type(count) ~= "number") then return end + if(type(count) ~= "number") then return end local scrollFrame = MountJournal.ListScrollFrame; local offset = HybridScrollFrame_GetOffset(scrollFrame); - local buttons = scrollFrame.buttons; + local buttons = scrollFrame.buttons; for i=1, #buttons do local button = buttons[i]; local displayIndex = i + offset; @@ -257,7 +257,7 @@ local CheckButton_OnEnter = function(self) GameTooltip:AddLine("Hold |cff00FF00[SHIFT]|r or |cff00FF00[CTRL]|r while \nclicking to force this mount \nover all others.",1,1,1) end GameTooltip:AddLine(TOOLTIP_SUMMARY,1,1,1) - + GameTooltip:Show() end @@ -270,31 +270,31 @@ local _hook_SetChecked = function(self, checked) if(checked) then r,g,b = self:GetCheckedTexture():GetVertexColor() end - self:SetBackdropBorderColor(r,g,b) + self:SetBackdropBorderColor(r,g,b) end local function CreateMountCheckBox(name, parent) local frame = CreateFrame("CheckButton", name, parent, "UICheckButtonTemplate") frame:RemoveTextures() frame:SetBackdrop({ - bgFile = SV.media.statusbar.gloss, - edgeFile = [[Interface\BUTTONS\WHITE8X8]], - tile = false, - tileSize = 0, - edgeSize = 1, - insets = + bgFile = SV.media.statusbar.gloss, + edgeFile = [[Interface\BUTTONS\WHITE8X8]], + tile = false, + tileSize = 0, + edgeSize = 1, + insets = { - left = 0, - right = 0, - top = 0, - bottom = 0, - }, + left = 0, + right = 0, + top = 0, + bottom = 0, + }, }); - if(frame.Left) then frame.Left:SetAlpha(0) end - if(frame.Middle) then frame.Middle:SetAlpha(0) end - if(frame.Right) then frame.Right:SetAlpha(0) end - if(frame.SetNormalTexture) then frame:SetNormalTexture("") end + if(frame.Left) then frame.Left:SetAlpha(0) end + if(frame.Middle) then frame.Middle:SetAlpha(0) end + if(frame.Right) then frame.Right:SetAlpha(0) end + if(frame.SetNormalTexture) then frame:SetNormalTexture("") end if(frame.SetDisabledTexture) then frame:SetDisabledTexture("") end if(frame.SetCheckedTexture) then frame:SetCheckedTexture("") end if(frame.SetHighlightTexture) then @@ -304,17 +304,17 @@ local function CreateMountCheckBox(name, parent) frame.hover = hover; end frame.hover:SetTexture(0.1, 0.8, 0.8, 0.5) - frame:SetHighlightTexture(frame.hover) + frame:SetHighlightTexture(frame.hover) end if(frame.SetPushedTexture) then - if(not frame.pushed) then + if(not frame.pushed) then local pushed = frame:CreateTexture(nil, "OVERLAY") pushed:InsetPoints(frame.Panel) frame.pushed = pushed; end frame.pushed:SetTexture(0.1, 0.8, 0.1, 0.3) frame:SetPushedTexture(frame.pushed) - end + end if(frame.SetCheckedTexture) then if(not frame.checked) then local checked = frame:CreateTexture(nil, "OVERLAY") @@ -324,7 +324,7 @@ local function CreateMountCheckBox(name, parent) frame.checked:SetTexture(SV.media.statusbar.gloss) frame.checked:SetVertexColor(0, 1, 0, 1) - + frame:SetCheckedTexture(frame.checked) end @@ -332,8 +332,8 @@ local function CreateMountCheckBox(name, parent) return frame end; ---[[ -########################################################## +--[[ +########################################################## LOAD BY TRIGGER ########################################################## ]]-- @@ -345,28 +345,28 @@ local function InitializeLetsRide() end SV.private.Mounts = SV.private.Mounts or {} - if not SV.private.Mounts.types then + if not SV.private.Mounts.types then SV.private.Mounts.types = { - ["GROUND"] = false, - ["FLYING"] = false, - ["SWIMMING"] = false, + ["GROUND"] = false, + ["FLYING"] = false, + ["SWIMMING"] = false, ["SPECIAL"] = false } end - if not SV.private.Mounts.names then + if not SV.private.Mounts.names then SV.private.Mounts.names = { - ["GROUND"] = "", - ["FLYING"] = "", - ["SWIMMING"] = "", - ["SPECIAL"] = "" - } + ["GROUND"] = "", + ["FLYING"] = "", + ["SWIMMING"] = "", + ["SPECIAL"] = "" + } end UpdateMountsCache() local scrollFrame = MountJournal.ListScrollFrame; local scrollBar = _G["MountJournalListScrollFrameScrollBar"] - local buttons = scrollFrame.buttons; + local buttons = scrollFrame.buttons; for i = 1, #buttons do local button = buttons[i] @@ -385,32 +385,32 @@ local function InitializeLetsRide() buttonBar["GROUND"]:SetPoint("BOTTOMLEFT", buttonBar, "BOTTOMLEFT", 6, 4) buttonBar["GROUND"]:SetBackdropColor(0.2, 0.7, 0.1, 0.25) buttonBar["GROUND"]:SetBackdropBorderColor(0, 0, 0, 1) - buttonBar["GROUND"]:GetCheckedTexture():SetVertexColor(0.2, 0.7, 0.1, 1) - buttonBar["GROUND"].key = "GROUND" + buttonBar["GROUND"]:GetCheckedTexture():SetVertexColor(0.2, 0.7, 0.1, 1) + buttonBar["GROUND"].key = "GROUND" buttonBar["GROUND"]:SetChecked(false) buttonBar["GROUND"]:SetScript("OnClick", CheckButton_OnClick) buttonBar["GROUND"]:SetScript("OnEnter", CheckButton_OnEnter) buttonBar["GROUND"]:SetScript("OnLeave", CheckButton_OnLeave) - buttonBar["FLYING"] = CreateMountCheckBox(("%s_FLYING"):format(barName), buttonBar) + buttonBar["FLYING"] = CreateMountCheckBox(("%s_FLYING"):format(barName), buttonBar) buttonBar["FLYING"]:SetSize(width,height) buttonBar["FLYING"]:SetPoint("BOTTOMLEFT", buttonBar["GROUND"], "BOTTOMRIGHT", 2, 0) buttonBar["FLYING"]:SetBackdropColor(1, 1, 0.2, 0.25) buttonBar["FLYING"]:SetBackdropBorderColor(0, 0, 0, 1) - buttonBar["FLYING"]:GetCheckedTexture():SetVertexColor(1, 1, 0.2, 1) - buttonBar["FLYING"].key = "FLYING" + buttonBar["FLYING"]:GetCheckedTexture():SetVertexColor(1, 1, 0.2, 1) + buttonBar["FLYING"].key = "FLYING" buttonBar["FLYING"]:SetChecked(false) buttonBar["FLYING"]:SetScript("OnClick", CheckButton_OnClick) buttonBar["FLYING"]:SetScript("OnEnter", CheckButton_OnEnter) buttonBar["FLYING"]:SetScript("OnLeave", CheckButton_OnLeave) - buttonBar["SWIMMING"] = CreateMountCheckBox(("%s_SWIMMING"):format(barName), buttonBar) + buttonBar["SWIMMING"] = CreateMountCheckBox(("%s_SWIMMING"):format(barName), buttonBar) buttonBar["SWIMMING"]:SetSize(width,height) buttonBar["SWIMMING"]:SetPoint("BOTTOMLEFT", buttonBar["FLYING"], "BOTTOMRIGHT", 2, 0) buttonBar["SWIMMING"]:SetBackdropColor(0.2, 0.42, 0.76, 0.25) buttonBar["SWIMMING"]:SetBackdropBorderColor(0, 0, 0, 1) - buttonBar["SWIMMING"]:GetCheckedTexture():SetVertexColor(0.2, 0.42, 0.76, 1) - buttonBar["SWIMMING"].key = "SWIMMING" + buttonBar["SWIMMING"]:GetCheckedTexture():SetVertexColor(0.2, 0.42, 0.76, 1) + buttonBar["SWIMMING"].key = "SWIMMING" buttonBar["SWIMMING"]:SetChecked(false) buttonBar["SWIMMING"]:SetScript("OnClick", CheckButton_OnClick) buttonBar["SWIMMING"]:SetScript("OnEnter", CheckButton_OnEnter) @@ -421,8 +421,8 @@ local function InitializeLetsRide() buttonBar["SPECIAL"]:SetPoint("BOTTOMLEFT", buttonBar["SWIMMING"], "BOTTOMRIGHT", 2, 0) buttonBar["SPECIAL"]:SetBackdropColor(0.7, 0.1, 0.1, 0.25) buttonBar["SPECIAL"]:SetBackdropBorderColor(0, 0, 0, 1) - buttonBar["SPECIAL"]:GetCheckedTexture():SetVertexColor(0.7, 0.1, 0.1, 1) - buttonBar["SPECIAL"].key = "SPECIAL" + buttonBar["SPECIAL"]:GetCheckedTexture():SetVertexColor(0.7, 0.1, 0.1, 1) + buttonBar["SPECIAL"].key = "SPECIAL" buttonBar["SPECIAL"]:SetChecked(false) buttonBar["SPECIAL"]:SetScript("OnClick", CheckButton_OnClick) buttonBar["SPECIAL"]:SetScript("OnEnter", CheckButton_OnEnter) @@ -447,8 +447,8 @@ local function InitializeLetsRide() end SV.Events:On("CORE_INITIALIZED", InitializeLetsRide); ---[[ -########################################################## +--[[ +########################################################## KEYBIND FUNCTION ########################################################## ]]-- @@ -466,11 +466,11 @@ _G.SVUILetsRide = function() end SV.private.Mounts = SV.private.Mounts or {} - if not SV.private.Mounts.types then + if not SV.private.Mounts.types then SV.private.Mounts.types = { - ["GROUND"] = false, - ["FLYING"] = false, - ["SWIMMING"] = false, + ["GROUND"] = false, + ["FLYING"] = false, + ["SWIMMING"] = false, ["SPECIAL"] = false } end @@ -501,4 +501,4 @@ _G.SVUILetsRide = function() MountUp(checkList["GROUND"]) end end -end \ No newline at end of file +end diff --git a/SVUI_ActionBars/components/zone.lua b/SVUI_ActionBars/components/zone.lua index 40bc6ab..01f021a 100644 --- a/SVUI_ActionBars/components/zone.lua +++ b/SVUI_ActionBars/components/zone.lua @@ -1,7 +1,7 @@ --[[ ########################################################## S V U I By: Munglunch -########################################################## +########################################################## LOCALIZED LUA FUNCTIONS ########################################################## ]]-- @@ -37,8 +37,8 @@ local IsModifiedClick = _G.IsModifiedClick; local RegisterStateDriver = _G.RegisterStateDriver; local RANGE_INDICATOR = _G.RANGE_INDICATOR; local CooldownFrame_SetTimer = _G.CooldownFrame_SetTimer; ---[[ -########################################################## +--[[ +########################################################## GET ADDON DATA ########################################################## ]]-- @@ -47,8 +47,8 @@ local L = SV.L; local MOD = SV.ActionBars; local NO_ART = SV.NoTexture; ---[[ -########################################################## +--[[ +########################################################## DRAENOR ZONE BUTTON INTERNALS ########################################################## ]]-- @@ -126,7 +126,7 @@ local DraenorButtonUpdate = function(self) end local start, duration, enable = GetSpellCooldown(name); - + if(usesCharges and charges < maxCharges) then CooldownFrame_SetTimer(self.Cooldown, chargeStart, chargeDuration, enable, charges, maxCharges); elseif(start) then @@ -136,8 +136,8 @@ local DraenorButtonUpdate = function(self) self.spellName = name; self.spellID = spellID; end ---[[ -########################################################## +--[[ +########################################################## ZONE BUTTON CONSTRUCT ########################################################## ]]-- @@ -218,8 +218,8 @@ local ClearButtonSpell = function(self) self:SetAttribute('spell', nil); end end ---[[ -########################################################## +--[[ +########################################################## PACKAGE CALL ########################################################## ]]-- @@ -229,7 +229,7 @@ function MOD:InitializeZoneButton() draenor:SetSize(size,size); draenor:SetPoint("CENTER", SVUI_DraenorButtonHolder, "CENTER", 0, 0); draenor:SetAlpha(0); - draenor:SetStyle("Icon"); + draenor:SetStyle("!_ActionSlot"); draenor.SetUsage = SetButtonSpell; draenor.ClearUsage = ClearButtonSpell; @@ -240,7 +240,7 @@ function MOD:InitializeZoneButton() if(SV.Allegiance == 'Horde') then texture = "Interface\\ExtraButton\\GarrZoneAbility-BarracksHorde"; end - + local Artwork = draenor.Panel:CreateTexture('$parentArtwork', 'BACKGROUND') Artwork:SetPoint('CENTER', -2, 2) Artwork:SetSize(size * 4.2, size * 2.1) @@ -289,8 +289,8 @@ function MOD:InitializeZoneButton() end ]]); - draenor:SetScript('OnEnter', SpellButton_OnEnter); - draenor:SetScript('OnLeave', GameTooltip_Hide); + draenor:SetScript('OnEnter', SpellButton_OnEnter); + draenor:SetScript('OnLeave', GameTooltip_Hide); draenor:RegisterForDrag("LeftButton"); draenor:SetScript('OnDragStart', DraenorButton_OnDrag); @@ -306,4 +306,4 @@ function MOD:InitializeZoneButton() SV:NewAnchor(draenor, L["Zone Ability Button"]); DraenorZoneAbilityFrame:UnregisterAllEvents() -end \ No newline at end of file +end diff --git a/SVUI_Chat/SVUI_Chat.lua b/SVUI_Chat/SVUI_Chat.lua index fe37ae8..d7cea10 100644 --- a/SVUI_Chat/SVUI_Chat.lua +++ b/SVUI_Chat/SVUI_Chat.lua @@ -762,7 +762,12 @@ do _repositionDockedTabs() end - NewHook("FCFDock_UpdateTabs", _repositionDockedTabs) + local function _hook_FCFDock_UpdateTabs(...) + TABS_DIRTY = true + _repositionDockedTabs() + end + + NewHook("FCFDock_UpdateTabs", _hook_FCFDock_UpdateTabs) local function _customTab(tab, chatID, enabled) if(tab.IsStyled) then return end @@ -1161,14 +1166,12 @@ HOOKS local function _hook_SetTabPosition(chatFrame) local chatTab = _G[chatFrame:GetName().."Tab"]; local frame = chatTab.Holder - if(frame) then - if(not chatFrame.isLocked) then - frame.isDocked = false; - frame:ClearAllPoints(); - frame:SetPoint("TOPLEFT", chatFrame, "BOTTOMLEFT", -3, -6); - TABS_DIRTY = true; - AnchorInsertHighlight(); - end + if(frame and (not chatFrame.isLocked)) then + frame.isDocked = false; + frame:ClearAllPoints(); + frame:SetPoint("TOPLEFT", chatFrame, "BOTTOMLEFT", -3, -6); + TABS_DIRTY = true; + AnchorInsertHighlight(); end end diff --git a/SVUI_NamePlates/Loader.lua b/SVUI_NamePlates/Loader.lua index 2f67925..8cae1d6 100644 --- a/SVUI_NamePlates/Loader.lua +++ b/SVUI_NamePlates/Loader.lua @@ -352,7 +352,6 @@ function MOD:LoadOptions() name = L["Threat Coloring"], guiInline = true, order = 10, - disabled = function(key) return not SV.db[Schema].threat.enable end, args = { enable = { type = "toggle", diff --git a/SVUI_Skins/artwork/Arch-Progress-Bg.blp b/SVUI_Skins/artwork/Arch-Progress-Bg.blp new file mode 100644 index 0000000..f687762 Binary files /dev/null and b/SVUI_Skins/artwork/Arch-Progress-Bg.blp differ diff --git a/SVUI_Skins/artwork/Arch-Progress-Fill.blp b/SVUI_Skins/artwork/Arch-Progress-Fill.blp new file mode 100644 index 0000000..74b84c2 Binary files /dev/null and b/SVUI_Skins/artwork/Arch-Progress-Fill.blp differ diff --git a/SVUI_Skins/artwork/ArcheologyToast.blp b/SVUI_Skins/artwork/ArcheologyToast.blp new file mode 100644 index 0000000..17a6c92 Binary files /dev/null and b/SVUI_Skins/artwork/ArcheologyToast.blp differ diff --git a/SVUI_Skins/components/blizzard/archeology.lua b/SVUI_Skins/components/blizzard/archeology.lua index 78114c3..6ee8f16 100644 --- a/SVUI_Skins/components/blizzard/archeology.lua +++ b/SVUI_Skins/components/blizzard/archeology.lua @@ -12,13 +12,13 @@ local SV = _G['SVUI']; local L = SV.L; local MOD = SV.Skins; local Schema = MOD.Schema; ---[[ -########################################################## +--[[ +########################################################## ARCHEOLOGYFRAME MODR ########################################################## ]]-- local function ArchaeologyStyle() - if SV.db.Skins.blizzard.enable ~= true or SV.db.Skins.blizzard.archaeology ~= true then return end + if SV.db.Skins.blizzard.enable ~= true or SV.db.Skins.blizzard.archaeology ~= true then return end ArchaeologyFrame:RemoveTextures() ArchaeologyFrameInset:RemoveTextures() @@ -44,9 +44,9 @@ local function ArchaeologyStyle() ArchaeologyFrameArtifactPageSolveFrameStatusBar:SetFrameLevel(ArchaeologyFrameArtifactPageSolveFrameStatusBar:GetFrameLevel()+2) ArchaeologyFrameArtifactPageSolveFrameStatusBar:SetStyle("Frame", "Default") - for b = 1, ARCHAEOLOGY_MAX_COMPLETED_SHOWN do + for b = 1, ARCHAEOLOGY_MAX_COMPLETED_SHOWN do local c = _G["ArchaeologyFrameCompletedPageArtifact"..b] - if c then + if c then _G["ArchaeologyFrameCompletedPageArtifact"..b.."Border"]:Die() _G["ArchaeologyFrameCompletedPageArtifact"..b.."Bg"]:Die() _G["ArchaeologyFrameCompletedPageArtifact"..b.."Icon"]:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) @@ -55,9 +55,9 @@ local function ArchaeologyStyle() _G["ArchaeologyFrameCompletedPageArtifact"..b.."Icon"].backdrop:WrapPoints(_G["ArchaeologyFrameCompletedPageArtifact"..b.."Icon"]) _G["ArchaeologyFrameCompletedPageArtifact"..b.."Icon"].backdrop:SetFrameLevel(c:GetFrameLevel()-2) _G["ArchaeologyFrameCompletedPageArtifact"..b.."Icon"]:SetDrawLayer("OVERLAY") - end + end end - + ArchaeologyFrameArtifactPageIcon:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) ArchaeologyFrameArtifactPageIcon.backdrop = CreateFrame("Frame", nil, ArchaeologyFrameArtifactPage) ArchaeologyFrameArtifactPageIcon.backdrop:SetStyle("!_Frame", "Default") @@ -67,17 +67,23 @@ local function ArchaeologyStyle() ArchaeologyFrameArtifactPageIcon:SetDrawLayer("OVERLAY") SV.API:Set("CloseButton", ArchaeologyFrameCloseButton) - local progressBarHolder = CreateFrame("Frame", "SVUI_ArcheologyProgressBar", nil) + local progressBarHolder = CreateFrame("Frame", "SVUI_ArcheologyProgressBar", SV.Screen) progressBarHolder:SetSize(240, 24) - progressBarHolder:SetPoint("BOTTOM", CastingBarFrame, "TOP", 0, 10) + progressBarHolder:SetPoint("TOP", SV.Screen, "CENTER", 0, -180) SV:NewAnchor(progressBarHolder, "Archeology Progress Bar") - + ArcheologyDigsiteProgressBar:SetAllPoints(progressBarHolder) progressBarHolder:SetParent(ArcheologyDigsiteProgressBar) -end ---[[ -########################################################## + + ArcheologyDigsiteProgressBar.Shadow:SetTexture("Interface\\AddOns\\SVUI_Skins\\artwork\\ArcheologyToast") + ArcheologyDigsiteProgressBar.BarBackground:SetTexture("Interface\\AddOns\\SVUI_Skins\\artwork\\ArcheologyToast") + ArcheologyDigsiteProgressBar.BarBorderAndOverlay:SetTexture("Interface\\AddOns\\SVUI_Skins\\artwork\\ArcheologyToast") + ArcheologyDigsiteProgressBar.Flash:SetTexture("Interface\\AddOns\\SVUI_Skins\\artwork\\ArcheologyToast") + ArcheologyDigsiteProgressBar.FillBar:SetStatusBarTexture("Interface\\AddOns\\SVUI_Skins\\artwork\\Arch-Progress-Fill") +end +--[[ +########################################################## MOD LOADING ########################################################## ]]-- -MOD:SaveBlizzardStyle("Blizzard_ArchaeologyUI", ArchaeologyStyle) \ No newline at end of file +MOD:SaveBlizzardStyle("Blizzard_ArchaeologyUI", ArchaeologyStyle)