diff --git a/SVUITheme_Simple/SVUITheme_Simple.toc b/SVUITheme_Simple/SVUITheme_Simple.toc index 13846a4..b48cf87 100644 --- a/SVUITheme_Simple/SVUITheme_Simple.toc +++ b/SVUITheme_Simple/SVUITheme_Simple.toc @@ -1,4 +1,4 @@ -## Interface: 70000 +## Interface: 70100 ## Author: Failcoder ## Version: 1.0.0 ## Title: |cffFF9900SVUI Theme: |r|cff00EFFFSimple|r diff --git a/SVUI_!Core/SVUI_!Core.toc b/SVUI_!Core/SVUI_!Core.toc index d5042de..98fdf3b 100644 --- a/SVUI_!Core/SVUI_!Core.toc +++ b/SVUI_!Core/SVUI_!Core.toc @@ -1,4 +1,4 @@ -## Interface: 70000 +## Interface: 70100 ## Author: Failcoder ## Version: 1.3.5 ## Title: |cffFF9900SuperVillain UI: |r|cff00FF00!Core|r diff --git a/SVUI_!Core/libs/AceVillain-1.0/AceVillain-1.0.toc b/SVUI_!Core/libs/AceVillain-1.0/AceVillain-1.0.toc index 9a66a71..4113385 100644 --- a/SVUI_!Core/libs/AceVillain-1.0/AceVillain-1.0.toc +++ b/SVUI_!Core/libs/AceVillain-1.0/AceVillain-1.0.toc @@ -1,4 +1,4 @@ -## Interface: 70000 +## Interface: 70100 ## LoadOnDemand: 1 ## Title: Lib: AceVillain-1.0 diff --git a/SVUI_!Core/libs/LibSharedMedia-3.0/LibSharedMedia-3.0.toc b/SVUI_!Core/libs/LibSharedMedia-3.0/LibSharedMedia-3.0.toc index a1fe837..2b4e9e0 100644 --- a/SVUI_!Core/libs/LibSharedMedia-3.0/LibSharedMedia-3.0.toc +++ b/SVUI_!Core/libs/LibSharedMedia-3.0/LibSharedMedia-3.0.toc @@ -1,4 +1,4 @@ -## Interface: 70000 +## Interface: 70100 ## LoadOnDemand: 1 ## X-Curse-Packaged-Version: 6.1.0 - r92 ## X-Curse-Project-Name: LibSharedMedia-3.0 diff --git a/SVUI_!Core/libs/_SVUI_Lib/Registry.lua b/SVUI_!Core/libs/_SVUI_Lib/Registry.lua index 4302e82..33bf87a 100644 --- a/SVUI_!Core/libs/_SVUI_Lib/Registry.lua +++ b/SVUI_!Core/libs/_SVUI_Lib/Registry.lua @@ -1114,9 +1114,10 @@ local Core_HandleError = function(self, schema, action, catch) local err_message = (debugPattern):format(schema, action, timestamp, catch) local count = #self.ERRORLOG + 1; self.ERRORLOG[count] = err_message; - if(self.DebugMode == true) then - self.HasErrors = true; - --self:Debugger(err_message) + self.HasErrors = true; + if(self.DebugMode == true and self.initialized and self.ShowErrors) then + self:ShowErrors(); + wipe(self.ERRORLOG); end end @@ -1152,7 +1153,7 @@ function lib:NewCore(gfile, efile, pfile, mfile, sfile) CoreObject.NameID = CoreGlobalName; CoreObject.Version = AddonVersion; CoreObject.GameVersion = tonumber(InterfaceVersion); - CoreObject.DebugMode = true; + CoreObject.DebugMode = false; CoreObject.HasErrors = false; CoreObject.Schema = GetAddOnMetadata(CoreName, SchemaFromMeta); CoreObject.TitleID = GetAddOnMetadata(CoreName, HeaderFromMeta); diff --git a/SVUI_!Core/system/api.lua b/SVUI_!Core/system/api.lua index dd4dce6..426006f 100644 --- a/SVUI_!Core/system/api.lua +++ b/SVUI_!Core/system/api.lua @@ -1495,7 +1495,6 @@ API INJECTION ########################################################## ]]-- local MODIFIED_OBJECTS = {}; -local CURRENT_OBJECT = CreateFrame("Frame"); local function AppendFrameMethods(OBJECT) local objType = OBJECT:GetObjectType() @@ -1539,10 +1538,10 @@ local function AppendFontStringMethods(OBJECT) if not OBJECT.InsetPoints then META.InsetPoints = InsetPoints end end +local CURRENT_OBJECT = CreateFrame("Frame"); AppendFrameMethods(CURRENT_OBJECT) AppendTextureMethods(CURRENT_OBJECT:CreateTexture()) AppendFontStringMethods(CURRENT_OBJECT:CreateFontString()) - CURRENT_OBJECT = EnumerateFrames() while CURRENT_OBJECT do AppendFrameMethods(CURRENT_OBJECT) diff --git a/SVUI_!Options/SVUI_!Options.toc b/SVUI_!Options/SVUI_!Options.toc index 070da69..c5d0083 100644 --- a/SVUI_!Options/SVUI_!Options.toc +++ b/SVUI_!Options/SVUI_!Options.toc @@ -1,4 +1,4 @@ -## Interface: 70000 +## Interface: 70100 ## Author: Failcoder ## Version: 1.3.5 ## Title: |cffFF9900SuperVillain UI: |r|cff00FF00!Options|r diff --git a/SVUI_ActionBars/SVUI_ActionBars.toc b/SVUI_ActionBars/SVUI_ActionBars.toc index 108aea6..945540e 100644 --- a/SVUI_ActionBars/SVUI_ActionBars.toc +++ b/SVUI_ActionBars/SVUI_ActionBars.toc @@ -1,4 +1,4 @@ -## Interface: 70000 +## Interface: 70100 ## Author: Failcoder ## Version: 1.3.5 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00Action Bars|r diff --git a/SVUI_ActionBars/libs/LibActionButton-1.0/LibActionButton-1.0.toc b/SVUI_ActionBars/libs/LibActionButton-1.0/LibActionButton-1.0.toc index 61153b6..d4ca3f2 100644 --- a/SVUI_ActionBars/libs/LibActionButton-1.0/LibActionButton-1.0.toc +++ b/SVUI_ActionBars/libs/LibActionButton-1.0/LibActionButton-1.0.toc @@ -1,4 +1,4 @@ -## Interface: 70000 +## Interface: 70100 ## Title: Lib: ActionButton-1.0 ## Notes: Creates and manages secure Action Buttons ## Author: Nevcairiel diff --git a/SVUI_ActionBars/libs/LibActionButton-1.0/LibButtonGlow-1.0/LibButtonGlow-1.0.toc b/SVUI_ActionBars/libs/LibActionButton-1.0/LibButtonGlow-1.0/LibButtonGlow-1.0.toc index 186c094..92e09ab 100644 --- a/SVUI_ActionBars/libs/LibActionButton-1.0/LibButtonGlow-1.0/LibButtonGlow-1.0.toc +++ b/SVUI_ActionBars/libs/LibActionButton-1.0/LibButtonGlow-1.0/LibButtonGlow-1.0.toc @@ -1,4 +1,4 @@ -## Interface: 70000 +## Interface: 70100 ## Title: Lib: ButtonGlow-1.0 ## Notes: Replacement for ActionButton_Show/HideOverlayGlow APIs ## Author: Nevcairiel diff --git a/SVUI_Auras/SVUI_Auras.toc b/SVUI_Auras/SVUI_Auras.toc index 6680dc6..e9f8efb 100644 --- a/SVUI_Auras/SVUI_Auras.toc +++ b/SVUI_Auras/SVUI_Auras.toc @@ -1,4 +1,4 @@ -## Interface: 70000 +## Interface: 70100 ## Author: Failcoder ## Version: 1.3.5 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00Auras|r diff --git a/SVUI_Chat/SVUI_Chat.toc b/SVUI_Chat/SVUI_Chat.toc index 65f4be1..f1638b3 100644 --- a/SVUI_Chat/SVUI_Chat.toc +++ b/SVUI_Chat/SVUI_Chat.toc @@ -1,4 +1,4 @@ -## Interface: 70000 +## Interface: 70100 ## Author: Failcoder ## Version: 1.3.5 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00Chat|r diff --git a/SVUI_CraftOMatic/SVUI_CraftOMatic.toc b/SVUI_CraftOMatic/SVUI_CraftOMatic.toc index 185efd3..602d08f 100644 --- a/SVUI_CraftOMatic/SVUI_CraftOMatic.toc +++ b/SVUI_CraftOMatic/SVUI_CraftOMatic.toc @@ -1,4 +1,4 @@ -## Interface: 70000 +## Interface: 70100 ## Author: Failcoder ## Version: 1.0.09 ## Title: |cffFF9900SVUI Plugin: |r|cffFF69B4Craft-O-Matic|r diff --git a/SVUI_Inventory/SVUI_Inventory.toc b/SVUI_Inventory/SVUI_Inventory.toc index 4b5bf43..8eee4e2 100644 --- a/SVUI_Inventory/SVUI_Inventory.toc +++ b/SVUI_Inventory/SVUI_Inventory.toc @@ -1,4 +1,4 @@ -## Interface: 70000 +## Interface: 70100 ## Author: Failcoder ## Version: 1.3.5 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00Inventory|r diff --git a/SVUI_Maps/SVUI_Maps.toc b/SVUI_Maps/SVUI_Maps.toc index 4302c3c..bc5a269 100644 --- a/SVUI_Maps/SVUI_Maps.toc +++ b/SVUI_Maps/SVUI_Maps.toc @@ -1,4 +1,4 @@ -## Interface: 70000 +## Interface: 70100 ## Author: Failcoder ## Version: 1.3.5 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00Maps|r diff --git a/SVUI_NamePlates/SVUI_NamePlates.toc b/SVUI_NamePlates/SVUI_NamePlates.toc index e4ab993..1100eb7 100644 --- a/SVUI_NamePlates/SVUI_NamePlates.toc +++ b/SVUI_NamePlates/SVUI_NamePlates.toc @@ -1,4 +1,4 @@ -## Interface: 70000 +## Interface: 70100 ## Author: Failcoder ## Version: 1.3.5 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00NamePlates|r diff --git a/SVUI_PKG.toc b/SVUI_PKG.toc index 203478b..9126784 100644 --- a/SVUI_PKG.toc +++ b/SVUI_PKG.toc @@ -1,4 +1,4 @@ -## Interface: 70000 +## Interface: 70100 ## Author: Failcoder ## Version: 1.3.5 ## Title: |cffFF9900SuperVillain UI|r diff --git a/SVUI_QuestTracker/SVUI_QuestTracker.toc b/SVUI_QuestTracker/SVUI_QuestTracker.toc index 9e40648..c0f06cf 100644 --- a/SVUI_QuestTracker/SVUI_QuestTracker.toc +++ b/SVUI_QuestTracker/SVUI_QuestTracker.toc @@ -1,4 +1,4 @@ -## Interface: 70000 +## Interface: 70100 ## Author: Failcoder ## Version: 1.3.5 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00QuestTracker|r diff --git a/SVUI_Skins/SVUI_Skins.lua b/SVUI_Skins/SVUI_Skins.lua index 8cea6a5..52c9467 100644 --- a/SVUI_Skins/SVUI_Skins.lua +++ b/SVUI_Skins/SVUI_Skins.lua @@ -53,11 +53,14 @@ MOD.EventListeners = {}; MOD.OnLoadAddons = {}; MOD.SkinnedAddons = {}; MOD.Debugging = false; +MOD.DebugInternal = false; +MOD.DebugExternal = false; --[[ ########################################################## CORE FUNCTIONS ########################################################## ]]-- +local BLIZZCACHE = {}; local charming = {"Spiffy", "Pimped Out", "Fancy", "Awesome", "Bad Ass", "Sparkly", "Gorgeous", "Handsome", "Shiny"} local styleMessage = '|cffFFAA00[Skinned]|r |cff00FF77%s|r Is Now %s!' @@ -76,16 +79,13 @@ end function MOD:Style(style, fn, ...) local pass, catch = pcall(fn, ...) - --self.Debugging = true if(catch and self.Debugging) then SV:HandleError("SKINS", style, catch); - return - end - if(pass and (not style:find("Blizzard")) and not self.SkinnedAddons[style]) then + elseif(pass and (not style:find("Blizzard")) and (not style:find("CUSTOM")) and not self.SkinnedAddons[style]) then self.SkinnedAddons[style] = true - self.AddOnQueue[style] = nil + return true; end - self.Debugging = false + return false; end function MOD:IsAddonReady(addon, ...) @@ -132,8 +132,8 @@ function MOD:SaveBlizzardStyle(addon, fn, force) end end -function MOD:SaveCustomStyle(fn) - tinsert(MOD.CustomQueue, fn) +function MOD:SaveCustomStyle(addon, fn) + self.CustomQueue["CUSTOM_"..addon] = fn; end function MOD:DefineEventFunction(addonEvent, addon) @@ -146,7 +146,9 @@ function MOD:DefineEventFunction(addonEvent, addon) self[addonEvent] = function(self, event, ...) for name,fn in pairs(self.AddOnQueue) do if self:IsAddonReady(name) and self.EventListeners[event] and self.EventListeners[event][name] then + self.Debugging = self.DebugExternal self:Style(name, fn, event, ...) + self.AddOnQueue[style] = nil end end end @@ -171,29 +173,32 @@ function MOD:SafeEventRemoval(addon, event) end function MOD:PLAYER_ENTERING_WORLD(event, ...) - for addonName,fn in pairs(self.OnLoadAddons) do - if(IsAddOnLoaded(addonName)) then - --print(addonName) - --self.Debugging = true - self:Style(addonName, fn, event, ...) - self.OnLoadAddons[addonName] = nil + for name,fn in pairs(self.OnLoadAddons) do + if(IsAddOnLoaded(name)) then + self.Debugging = self.DebugInternal + if(self:Style(name, fn, event, ...)) then + self.OnLoadAddons[name] = nil + end end end - for _,fn in pairs(self.CustomQueue)do - --print(_) - fn(event, ...) + for name,fn in pairs(self.CustomQueue) do + self.Debugging = self.DebugInternal + if(self:Style(name, fn, event, ...)) then + self.CustomQueue[name] = nil + end end - twipe(self.CustomQueue) - local listener = self.EventListeners[event] - for addonName,fn in pairs(self.AddOnQueue)do - if(SV.db.Skins.addons[addonName] == nil) then - SV.db.Skins.addons[addonName] = true + for name,fn in pairs(self.AddOnQueue)do + if(SV.db.Skins.addons[name] == nil) then + SV.db.Skins.addons[name] = true end - if(listener[addonName] and self:IsAddonReady(addonName)) then - self:Style(addonName, fn, event, ...) + if(listener[name] and self:IsAddonReady(name)) then + self.Debugging = self.DebugExternal + if(self:Style(name, fn, event, ...)) then + self.AddOnQueue[name] = nil + end end end @@ -205,10 +210,11 @@ function MOD:ADDON_LOADED(event, addon) local needsUpdate = false for name, fn in pairs(self.OnLoadAddons) do if(addon:find(name)) then - --self.Debugging = true - self:Style(name, fn, event, addon) - self.OnLoadAddons[name] = nil - needsUpdate = true + self.Debugging = self.DebugInternal + if(self:Style(name, fn, event, addon)) then + self.OnLoadAddons[name] = nil + needsUpdate = true + end end end @@ -216,8 +222,11 @@ function MOD:ADDON_LOADED(event, addon) if(listener) then for name, fn in pairs(self.AddOnQueue) do if(listener[name] and self:IsAddonReady(name)) then - self:Style(name, fn, event, addon) - needsUpdate = true + self.Debugging = self.DebugExternal + if(self:Style(name, fn, event, addon)) then + self.AddOnQueue[name] = nil + needsUpdate = true + end end end end diff --git a/SVUI_Skins/SVUI_Skins.toc b/SVUI_Skins/SVUI_Skins.toc index 0d7bdcb..d177285 100644 --- a/SVUI_Skins/SVUI_Skins.toc +++ b/SVUI_Skins/SVUI_Skins.toc @@ -1,4 +1,4 @@ -## Interface: 70000 +## Interface: 70100 ## Author: Failcoder, Azilroka, Sortokk ## Version: 1.3.5 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00Skins|r diff --git a/SVUI_Skins/components/addons/Altoholic.lua b/SVUI_Skins/components/addons/Altoholic.lua index ab557ee..45b8653 100644 --- a/SVUI_Skins/components/addons/Altoholic.lua +++ b/SVUI_Skins/components/addons/Altoholic.lua @@ -84,19 +84,19 @@ local function StyleAltoholic(event, addon) SV.API:Set("DropDown", AltoholicTabSummary_SelectLocation, 200) if(AltoholicFrameSummaryScrollFrame) then - AltoholicFrameSummaryScrollFrame:RemoveTextures(true) + AltoholicFrameSummaryScrollFrameScrollBar:RemoveTextures(true) end if(AltoholicFrameBagUsageScrollFrame) then - AltoholicFrameBagUsageScrollFrame:RemoveTextures(true) + AltoholicFrameBagUsageScrollFrameScrollBar:RemoveTextures(true) end if(AltoholicFrameSkillsScrollFrame) then - AltoholicFrameSkillsScrollFrame:RemoveTextures(true) + AltoholicFrameSkillsScrollFrameScrollBar:RemoveTextures(true) end if(AltoholicFrameActivityScrollFrame) then - AltoholicFrameActivityScrollFrame:RemoveTextures(true) + AltoholicFrameActivityScrollFrameScrollBar:RemoveTextures(true) end SV.API:Set("Button", AltoholicTabSummary_RequestSharing) @@ -138,9 +138,9 @@ local function StyleAltoholic(event, addon) SV.API:Set("Button", AltoholicTabCharacters_Sort1) SV.API:Set("Button", AltoholicTabCharacters_Sort2) SV.API:Set("Button", AltoholicTabCharacters_Sort3) - AltoholicFrameContainersScrollFrame:RemoveTextures(true) - AltoholicFrameQuestsScrollFrame:RemoveTextures(true) - AltoholicFrameRecipesScrollFrame:RemoveTextures(true) + AltoholicFrameContainersScrollFrameScrollBar:RemoveTextures(true) + AltoholicFrameQuestsScrollFrameScrollBar:RemoveTextures(true) + AltoholicFrameRecipesScrollFrameScrollBar:RemoveTextures(true) local Buttons = { 'AltoholicTabCharacters_Characters', @@ -169,8 +169,8 @@ local function StyleAltoholic(event, addon) if IsAddOnLoaded("Altoholic_Achievements") then SV.API:Set("!_Frame", AltoholicFrameAchievements) - AltoholicFrameAchievementsScrollFrame:RemoveTextures(true) - AltoholicAchievementsMenuScrollFrame:RemoveTextures(true) + AltoholicFrameAchievementsScrollFrameScrollBar:RemoveTextures(true) + AltoholicAchievementsMenuScrollFrameScrollBar:RemoveTextures(true) SV.API:Set("ScrollBar", AltoholicFrameAchievementsScrollFrameScrollBar) SV.API:Set("ScrollBar", AltoholicAchievementsMenuScrollFrameScrollBar) SV.API:Set("DropDown", AltoholicTabAchievements_SelectRealm) @@ -204,7 +204,7 @@ local function StyleAltoholic(event, addon) end if IsAddOnLoaded("Altoholic_Grids") then - AltoholicFrameGridsScrollFrame:RemoveTextures(true) + AltoholicFrameGridsScrollFrameScrollBar:RemoveTextures(true) SV.API:Set("!_Frame", AltoholicFrameGrids) SV.API:Set("ScrollBar", AltoholicFrameGridsScrollFrameScrollBar) SV.API:Set("DropDown", AltoholicTabGrids_SelectRealm) @@ -233,7 +233,7 @@ local function StyleAltoholic(event, addon) SV.API:Set("Frame", AltoholicFrameGuildMembers) SV.API:Set("Frame", AltoholicFrameGuildBank) SV.API:Set("ScrollBar", AltoholicFrameGuildMembersScrollFrameScrollBar) - AltoholicFrameGuildMembersScrollFrame:RemoveTextures(true) + AltoholicFrameGuildMembersScrollFrameScrollBar:RemoveTextures(true) for i = 1, 2 do SV.API:Set("Button", _G["AltoholicTabGuildMenuItem"..i]) @@ -256,8 +256,8 @@ local function StyleAltoholic(event, addon) if IsAddOnLoaded("Altoholic_Search") then SV.API:Set("!_Frame", AltoholicFrameSearch) - AltoholicFrameSearchScrollFrame:RemoveTextures(true) - AltoholicSearchMenuScrollFrame:RemoveTextures(true) + AltoholicFrameSearchScrollFrameScrollBar:RemoveTextures(true) + AltoholicSearchMenuScrollFrameScrollBar:RemoveTextures(true) SV.API:Set("ScrollBar", AltoholicFrameSearchScrollFrameScrollBar) SV.API:Set("ScrollBar", AltoholicSearchMenuScrollFrameScrollBar) SV.API:Set("DropDown", AltoholicTabSearch_SelectRarity) diff --git a/SVUI_Skins/components/addons/LightHeaded.lua b/SVUI_Skins/components/addons/LightHeaded.lua index 67a6544..d9b4b44 100644 --- a/SVUI_Skins/components/addons/LightHeaded.lua +++ b/SVUI_Skins/components/addons/LightHeaded.lua @@ -53,7 +53,7 @@ local function StyleLightHeaded() SV.API:Set("Frame", LightHeadedFrameSub) SV.API:Set("Frame", LightHeadedSearchBox) SV.API:Set("Tooltip", LightHeadedTooltip) - LightHeadedScrollFrame:RemoveTextures() + LightHeadedScrollFrameScrollBar:RemoveTextures() lhframe.close:Hide() SV.API:Set("CloseButton", lhframe.close) diff --git a/SVUI_Skins/components/addons/TradeSkillDW.lua b/SVUI_Skins/components/addons/TradeSkillDW.lua index bc85018..a2b7076 100644 --- a/SVUI_Skins/components/addons/TradeSkillDW.lua +++ b/SVUI_Skins/components/addons/TradeSkillDW.lua @@ -31,12 +31,12 @@ local function StyleTradeSkillDW() assert(TradeSkillDW_QueueFrame, "AddOn Not Loaded") TradeSkillFrame:SetStyle("Frame", "Window2") - TradeSkillListScrollFrame:RemoveTextures(true) - TradeSkillDetailScrollFrame:RemoveTextures(true) + TradeSkillListScrollFrameScrollBar:RemoveTextures(true) + TradeSkillDetailScrollFrameScrollBar:RemoveTextures(true) TradeSkillFrameInset:RemoveTextures(true) TradeSkillExpandButtonFrame:RemoveTextures(true) TradeSkillDetailScrollChildFrame:RemoveTextures(true) - TradeSkillListScrollFrame:RemoveTextures(true) + TradeSkillListScrollFrameScrollBar:RemoveTextures(true) SV.API:Set("Frame", TradeSkillGuildFrame,"Transparent") SV.API:Set("Frame", TradeSkillGuildFrameContainer,"Transparent") TradeSkillGuildFrame:SetPoint("BOTTOMLEFT", TradeSkillFrame, "BOTTOMRIGHT", 3, 19) @@ -44,7 +44,7 @@ local function StyleTradeSkillDW() TradeSkillFrame:HookScript("OnShow", function() SV.API:Set("Frame", TradeSkillFrame) - TradeSkillListScrollFrame:RemoveTextures() + TradeSkillListScrollFrameScrollBar:RemoveTextures() if not TradeSkillDWExpandButton then return end if not TradeSkillDWExpandButton.styled then SV.API:Set("PageButton", TradeSkillDWExpandButton) @@ -119,7 +119,7 @@ local function StyleTradeSkillDW() TradeSkillDW_QueueFrameDown:SetStyle("Button") TradeSkillDW_QueueFrameUp:SetStyle("Button") TradeSkillDW_QueueFrameDo:SetStyle("Button") - TradeSkillDW_QueueFrameDetailScrollFrame:RemoveTextures() + TradeSkillDW_QueueFrameDetailScrollFrameScrollBar:RemoveTextures() TradeSkillDW_QueueFrameDetailScrollFrameChildFrame:RemoveTextures() TradeSkillDW_QueueFrameDetailScrollFrameChildFrameReagent1:RemoveTextures() TradeSkillDW_QueueFrameDetailScrollFrameChildFrameReagent2:RemoveTextures() @@ -130,7 +130,7 @@ local function StyleTradeSkillDW() TradeSkillDW_QueueFrameDetailScrollFrameChildFrameReagent7:RemoveTextures() TradeSkillDW_QueueFrameDetailScrollFrameChildFrameReagent8:RemoveTextures() SV.API:Set("ScrollBar", TradeSkillDW_QueueFrameDetailScrollFrameScrollBar) - TradeSkillListScrollFrame:RemoveTextures() + TradeSkillListScrollFrameScrollBar:RemoveTextures() end --[[#################################################]]-- MOD:SaveAddonStyle("TradeSkillDW", StyleTradeSkillDW) diff --git a/SVUI_Skins/components/blizzard/achievement.lua b/SVUI_Skins/components/blizzard/achievement.lua index 1072149..748192b 100644 --- a/SVUI_Skins/components/blizzard/achievement.lua +++ b/SVUI_Skins/components/blizzard/achievement.lua @@ -171,16 +171,16 @@ local function AchievementStyle() AchievementFrameHeaderTitle:SetPoint("TOPLEFT", AchievementFrame.Panel, "TOPLEFT", -30, -8) AchievementFrameHeaderPoints:ClearAllPoints() AchievementFrameHeaderPoints:SetPoint("LEFT", AchievementFrameHeaderTitle, "RIGHT", 2, 0) - AchievementFrameCategoriesContainer:SetStyle("Frame", "Inset", true, 2, -2, 2) - AchievementFrameAchievementsContainer:SetStyle("Frame", "Default") - AchievementFrameAchievementsContainer.Panel:SetPoint("TOPLEFT", 0, 2) - AchievementFrameAchievementsContainer.Panel:SetPoint("BOTTOMRIGHT", -3, -3) + --AchievementFrameCategoriesContainer:SetStyle("Frame", "Inset", true, 2, -2, 2) + -- AchievementFrameAchievementsContainer:SetStyle("Frame", "Default") + -- AchievementFrameAchievementsContainer.Panel:SetPoint("TOPLEFT", 0, 2) + -- AchievementFrameAchievementsContainer.Panel:SetPoint("BOTTOMRIGHT", -3, -3) SV.API:Set("CloseButton", AchievementFrameCloseButton, AchievementFrame.Panel) SV.API:Set("DropDown", AchievementFrameFilterDropDown) AchievementFrameFilterDropDown:SetPoint("TOPRIGHT", AchievementFrame, "TOPRIGHT", -44, 5) SV.API:Set("ScrollBar", AchievementFrameCategoriesContainerScrollBar, 5) - SV.API:Set("ScrollBar", AchievementFrameAchievementsContainerScrollBar, 5) + --SV.API:Set("ScrollBar", AchievementFrameAchievementsContainerScrollBar, 5) SV.API:Set("ScrollBar", AchievementFrameStatsContainerScrollBar, 5) SV.API:Set("ScrollBar", AchievementFrameComparisonContainerScrollBar, 5) SV.API:Set("ScrollBar", AchievementFrameComparisonStatsContainerScrollBar, 5) diff --git a/SVUI_Skins/components/blizzard/alert.lua b/SVUI_Skins/components/blizzard/alert.lua index c31f7f0..d489e23 100644 --- a/SVUI_Skins/components/blizzard/alert.lua +++ b/SVUI_Skins/components/blizzard/alert.lua @@ -507,7 +507,7 @@ end MOD LOADING ########################################################## ]]-- -MOD:SaveCustomStyle(AlertStyle) +MOD:SaveCustomStyle("ALERTS", AlertStyle) -- /script GarrisonMissionAlertFrame:Show() -- /script GarrisonBuildingAlertFrame:Show() -- /script GarrisonFollowerAlertFrame:Show() diff --git a/SVUI_Skins/components/blizzard/auctionhouse.lua b/SVUI_Skins/components/blizzard/auctionhouse.lua index d363ff4..7b6412b 100644 --- a/SVUI_Skins/components/blizzard/auctionhouse.lua +++ b/SVUI_Skins/components/blizzard/auctionhouse.lua @@ -93,10 +93,10 @@ local function AuctionStyle() SV.API:Set("Window", AuctionFrame, false, true, 1, 2, -8) - BrowseFilterScrollFrame:RemoveTextures() - BrowseScrollFrame:RemoveTextures() - AuctionsScrollFrame:RemoveTextures() - BidScrollFrame:RemoveTextures() + BrowseFilterScrollFrameScrollBar:RemoveTextures() + BrowseScrollFrameScrollBar:RemoveTextures() + AuctionsScrollFrameScrollBar:RemoveTextures() + BidScrollFrameScrollBar:RemoveTextures() SV.API:Set("CloseButton", AuctionFrameCloseButton) SV.API:Set("ScrollBar", AuctionsScrollFrame) diff --git a/SVUI_Skins/components/blizzard/character.lua b/SVUI_Skins/components/blizzard/character.lua index 368fd35..e04b67f 100644 --- a/SVUI_Skins/components/blizzard/character.lua +++ b/SVUI_Skins/components/blizzard/character.lua @@ -50,7 +50,7 @@ local CharFrameList = { "CharacterFrameInsetRight", "PaperDollFrame", "PaperDollSidebarTabs", - "PaperDollEquipmentManagerPane" + --"PaperDollEquipmentManagerPane" }; local CharacterStatsSubFrames = { @@ -242,7 +242,7 @@ local function PaperDollEquipmentManagerPane_OnShow() GearManagerDialogPopup:RemoveTextures() GearManagerDialogPopup:SetStyle("Frame", "Inset", true) GearManagerDialogPopup:SetPoint("LEFT", PaperDollFrame, "RIGHT", 4, 0) - GearManagerDialogPopupScrollFrame:RemoveTextures() + GearManagerDialogPopupScrollFrameScrollBar:RemoveTextures() GearManagerDialogPopupEditBox:RemoveTextures() GearManagerDialogPopupEditBox:SetStyle("Frame", 'Inset') GearManagerDialogPopupOkay:SetStyle("Button") @@ -319,7 +319,7 @@ local function CharacterFrameStyle() SV.API:Set("ScrollBar", _G["PaperDollEquipmentManagerPaneScrollBar"], 5) for _,gName in pairs(CharFrameList) do - if(_G[gName]) then _G[gName]:RemoveTextures(true) end + if(_G[gName] and _G[gName].RemoveTextures) then _G[gName]:RemoveTextures(true) else print(gName) end end for _,gName in pairs(CharacterStatsSubFrames) do @@ -345,36 +345,36 @@ local function CharacterFrameStyle() CharacterModelFrame:SetStyle("!_Frame", "Model") - PaperDollTitlesPane:RemoveTextures() - PaperDollTitlesPaneScrollChild:RemoveTextures() - PaperDollTitlesPane:SetStyle("Frame", 'Inset') - PaperDollTitlesPane:HookScript("OnShow", PaperDollTitlesPane_OnShow) + --PaperDollTitlesPane:RemoveTextures() + --PaperDollTitlesPaneScrollChild:RemoveTextures() + --PaperDollTitlesPane:SetStyle("Frame", 'Inset') + --PaperDollTitlesPane:HookScript("OnShow", PaperDollTitlesPane_OnShow) - PaperDollEquipmentManagerPane:SetStyle("Frame", 'Inset') - PaperDollEquipmentManagerPaneEquipSet:SetStyle("Button") - PaperDollEquipmentManagerPaneSaveSet:SetStyle("Button") - PaperDollEquipmentManagerPaneEquipSet:SetWidth(PaperDollEquipmentManagerPaneEquipSet:GetWidth()-8) - PaperDollEquipmentManagerPaneSaveSet:SetWidth(PaperDollEquipmentManagerPaneSaveSet:GetWidth()-8) - PaperDollEquipmentManagerPaneEquipSet:SetPoint("TOPLEFT", PaperDollEquipmentManagerPane, "TOPLEFT", 8, 0) - PaperDollEquipmentManagerPaneSaveSet:SetPoint("LEFT", PaperDollEquipmentManagerPaneEquipSet, "RIGHT", 4, 0) - PaperDollEquipmentManagerPaneEquipSet.ButtonBackground:SetTexture("") + -- PaperDollEquipmentManagerPane:SetStyle("Frame", 'Inset') + -- PaperDollEquipmentManagerPaneEquipSet:SetStyle("Button") + -- PaperDollEquipmentManagerPaneSaveSet:SetStyle("Button") + -- PaperDollEquipmentManagerPaneEquipSet:SetWidth(PaperDollEquipmentManagerPaneEquipSet:GetWidth()-8) + -- PaperDollEquipmentManagerPaneSaveSet:SetWidth(PaperDollEquipmentManagerPaneSaveSet:GetWidth()-8) + -- PaperDollEquipmentManagerPaneEquipSet:SetPoint("TOPLEFT", PaperDollEquipmentManagerPane, "TOPLEFT", 8, 0) + -- PaperDollEquipmentManagerPaneSaveSet:SetPoint("LEFT", PaperDollEquipmentManagerPaneEquipSet, "RIGHT", 4, 0) + -- PaperDollEquipmentManagerPaneEquipSet.ButtonBackground:SetTexture("") - PaperDollEquipmentManagerPane:HookScript("OnShow", PaperDollEquipmentManagerPane_OnShow) + -- PaperDollEquipmentManagerPane:HookScript("OnShow", PaperDollEquipmentManagerPane_OnShow) for i = 1, 4 do SV.API:Set("Tab", _G["CharacterFrameTab"..i]) end ReputationFrame:RemoveTextures(true) - ReputationListScrollFrame:RemoveTextures() - ReputationListScrollFrame:SetStyle("Frame", "Inset") + --ReputationListScrollFrameScrollBar:RemoveTextures() + --ReputationListScrollFrameScrollBar:SetStyle("Frame", "Inset") ReputationDetailFrame:RemoveTextures() ReputationDetailFrame:SetStyle("Frame", "Inset", true) ReputationDetailFrame:SetPoint("TOPLEFT", ReputationFrame, "TOPRIGHT", 4, -28) ReputationFrame:HookScript("OnShow", Reputation_OnShow) hooksecurefunc("ExpandFactionHeader", Reputation_OnShow) hooksecurefunc("CollapseFactionHeader", Reputation_OnShow) - TokenFrameContainer:SetStyle("Frame", 'Inset') + --TokenFrameContainer:SetStyle("Frame", 'Inset') TokenFrame:HookScript("OnShow", function() for i = 1, GetCurrencyListSize() do @@ -408,4 +408,4 @@ end MOD LOADING ########################################################## ]]-- -MOD:SaveCustomStyle(CharacterFrameStyle) +MOD:SaveCustomStyle("CHARACTER", CharacterFrameStyle) diff --git a/SVUI_Skins/components/blizzard/chat.lua b/SVUI_Skins/components/blizzard/chat.lua index 951b4e7..724e597 100644 --- a/SVUI_Skins/components/blizzard/chat.lua +++ b/SVUI_Skins/components/blizzard/chat.lua @@ -310,4 +310,4 @@ end MOD LOADING ########################################################## ]]-- -MOD:SaveCustomStyle(ChatStyle) +MOD:SaveCustomStyle("CHAT", ChatStyle) diff --git a/SVUI_Skins/components/blizzard/collections.lua b/SVUI_Skins/components/blizzard/collections.lua index 0a76a8f..6b7d016 100644 --- a/SVUI_Skins/components/blizzard/collections.lua +++ b/SVUI_Skins/components/blizzard/collections.lua @@ -140,7 +140,7 @@ local function CollectionsJournalStyle() MountJournal.MountDisplay:RemoveTextures() MountJournal.MountDisplay.ShadowOverlay:RemoveTextures() MountJournal.MountCount:RemoveTextures() - MountJournalListScrollFrame:RemoveTextures() + --MountJournalListScrollFrameScrollBar:RemoveTextures() MountJournalMountButton:RemoveTextures() MountJournalMountButton:SetStyle("Button") MountJournalSearchBox:SetStyle("Editbox") @@ -185,7 +185,7 @@ local function CollectionsJournalStyle() PetJournalSearchBox:SetStyle("Editbox") PetJournalFilterButton:RemoveTextures(true) PetJournalFilterButton:SetStyle("Button") - PetJournalListScrollFrame:RemoveTextures() + --PetJournalListScrollFrameScrollBar:RemoveTextures() SV.API:Set("ScrollBar", PetJournalListScrollFrame) for i = 1, #PetJournal.listScroll.buttons do diff --git a/SVUI_Skins/components/blizzard/encounterjournal.lua b/SVUI_Skins/components/blizzard/encounterjournal.lua index 29ee498..b6915be 100644 --- a/SVUI_Skins/components/blizzard/encounterjournal.lua +++ b/SVUI_Skins/components/blizzard/encounterjournal.lua @@ -190,7 +190,7 @@ local function EncounterJournalStyle() ChangeTabHelper(EncounterJournalEncounterFrameInfoBossTab, 0, -10) ChangeTabHelper(EncounterJournalEncounterFrameInfoModelTab, 0, -20) - EncounterJournalEncounterFrameInfoOverviewScrollFrame:RemoveTextures() + EncounterJournalEncounterFrameInfoOverviewScrollFrameScrollBar:RemoveTextures() EncounterJournalEncounterFrameInfoOverviewScrollFrameScrollChildTitle:SetTextColor(1,1,0) EncounterJournalEncounterFrameInfoOverviewScrollFrameScrollChildLoreDescription:SetTextColor(1,1,1) EncounterJournalEncounterFrameInfoOverviewScrollFrameScrollChild.overviewDescription.Text:SetTextColor(1,1,1) diff --git a/SVUI_Skins/components/blizzard/friends.lua b/SVUI_Skins/components/blizzard/friends.lua index 52b2181..53818e1 100644 --- a/SVUI_Skins/components/blizzard/friends.lua +++ b/SVUI_Skins/components/blizzard/friends.lua @@ -32,12 +32,12 @@ local FriendsFrameList1 = { "ScrollOfResurrectionSelectionFrameList", "FriendsListFrame", "FriendsTabHeader", - "FriendsFrameFriendsScrollFrame", + "FriendsFrameFriendsScrollFrameScrollBar", "WhoFrameColumnHeader1", "WhoFrameColumnHeader2", "WhoFrameColumnHeader3", "WhoFrameColumnHeader4", - "ChannelListScrollFrame", + "ChannelListScrollFrameScrollBar", "ChannelRoster", "FriendsFramePendingButton1", "FriendsFramePendingButton2", @@ -134,7 +134,7 @@ local function FriendsFrameStyle() LFRQueueFrameCommentInset:RemoveTextures() LFRQueueFrameListInset:SetStyle("!_Frame", "Model") FriendsFrameInset:SetStyle("!_Frame", "Model") - --FriendsFrameFriendsScrollFrame:SetStyle("!_Frame", "Model") + --FriendsFrameFriendsScrollFrameScrollBar:SetStyle("!_Frame", "Model") WhoFrameListInset:SetStyle("!_Frame", "Model") --RaidFrame:SetStyle("!_Frame", "Model") @@ -201,19 +201,19 @@ local function FriendsFrameStyle() ChannelFrameDaughterFrameChannelPassword:SetStyle("Frame", "Default") ChannelFrame:HookScript("OnShow", function() - ChannelRosterScrollFrame:RemoveTextures() + ChannelRosterScrollFrameScrollBar:RemoveTextures() end) hooksecurefunc("FriendsFrame_OnEvent", function() - ChannelRosterScrollFrame:RemoveTextures() + ChannelRosterScrollFrameScrollBar:RemoveTextures() end) WhoFrame:HookScript("OnShow", function() - ChannelRosterScrollFrame:RemoveTextures() + ChannelRosterScrollFrameScrollBar:RemoveTextures() end) hooksecurefunc("FriendsFrame_OnEvent", function() - WhoListScrollFrame:RemoveTextures() + WhoListScrollFrameScrollBar:RemoveTextures() end) ChannelFrameDaughterFrame:SetStyle("Frame", 'Inset') @@ -265,12 +265,9 @@ local function FriendsFrameStyle() FriendsTabHeaderRecruitAFriendButtonIcon:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) FriendsTabHeaderRecruitAFriendButtonIcon:InsetPoints() - FriendsFrameIgnoreScrollFrame:SetStyle("!_Frame", "Model") + FriendsFrameIgnoreScrollFrameScrollBar:SetStyle("!_Frame", "Model") SV.API:Set("ScrollBar", FriendsFrameIgnoreScrollFrame, 4) - FriendsFramePendingScrollFrame:SetStyle("!_Frame", "Inset") - SV.API:Set("ScrollBar", FriendsFramePendingScrollFrame, 4) IgnoreListFrame:RemoveTextures() - PendingListFrame:RemoveTextures() ScrollOfResurrectionFrame:RemoveTextures() ScrollOfResurrectionFrameAcceptButton:SetStyle("Button") ScrollOfResurrectionFrameCancelButton:SetStyle("Button") @@ -287,4 +284,4 @@ end MOD LOADING ########################################################## ]]-- -MOD:SaveCustomStyle(FriendsFrameStyle) \ No newline at end of file +MOD:SaveCustomStyle("FRIENDS", FriendsFrameStyle) \ No newline at end of file diff --git a/SVUI_Skins/components/blizzard/guild.lua b/SVUI_Skins/components/blizzard/guild.lua index 52b9064..2a04874 100644 --- a/SVUI_Skins/components/blizzard/guild.lua +++ b/SVUI_Skins/components/blizzard/guild.lua @@ -370,9 +370,9 @@ local function GuildBankStyle() GuildBankFrameWithdrawButton:SetPoint("RIGHT", GuildBankFrameDepositButton, "LEFT", -2, 0) GuildBankInfoScrollFrame:SetPoint('TOPLEFT', GuildBankInfo, 'TOPLEFT', -10, 12) - GuildBankInfoScrollFrame:RemoveTextures() + GuildBankInfoScrollFrameScrollBar:RemoveTextures() GuildBankInfoScrollFrame:SetWidth(GuildBankInfoScrollFrame:GetWidth()-8) - GuildBankTransactionsScrollFrame:RemoveTextures() + GuildBankTransactionsScrollFrameScrollBar:RemoveTextures() for i = 1, NUM_GUILDBANK_COLUMNS do local frame = _G["GuildBankColumn"..i] @@ -436,7 +436,7 @@ local function GuildBankStyle() hooksecurefunc('GuildBankFrame_Update', _hook_GuildBankFrame_Update) GuildBankPopupFrame:RemoveTextures() - GuildBankPopupScrollFrame:RemoveTextures() + GuildBankPopupScrollFrameScrollBar:RemoveTextures() GuildBankPopupFrame:SetStyle("!_Frame", "Transparent", true) GuildBankPopupFrame:SetPoint("TOPLEFT", GuildBankFrame, "TOPRIGHT", 1, -30) GuildBankPopupOkayButton:SetStyle("Button") @@ -682,7 +682,7 @@ local function GuildControlStyle() GuildControlUI:RemoveTextures() GuildControlUIHbar:RemoveTextures() GuildControlUIRankBankFrameInset:RemoveTextures() - GuildControlUIRankBankFrameInsetScrollFrame:RemoveTextures() + GuildControlUIRankBankFrameInsetScrollFrameScrollBar:RemoveTextures() SV.API:Set("Window", GuildControlUI) diff --git a/SVUI_Skins/components/blizzard/help.lua b/SVUI_Skins/components/blizzard/help.lua index 97ab56e..0beb871 100644 --- a/SVUI_Skins/components/blizzard/help.lua +++ b/SVUI_Skins/components/blizzard/help.lua @@ -73,10 +73,10 @@ local function HelpFrameStyle() end HelpFrameHeader:SetFrameLevel(HelpFrameHeader:GetFrameLevel()+2) HelpFrameKnowledgebaseErrorFrame:SetFrameLevel(HelpFrameKnowledgebaseErrorFrame:GetFrameLevel()+2) - HelpFrameReportBugScrollFrame:RemoveTextures() - HelpFrameReportBugScrollFrame:SetStyle("Frame", "Default") - HelpFrameReportBugScrollFrame.Panel:SetPoint("TOPLEFT", -4, 4) - HelpFrameReportBugScrollFrame.Panel:SetPoint("BOTTOMRIGHT", 6, -4) + HelpFrameReportBugScrollFrameScrollBar:RemoveTextures() + HelpFrameReportBugScrollFrameScrollBar:SetStyle("Frame", "Default") + HelpFrameReportBugScrollFrameScrollBar.Panel:SetPoint("TOPLEFT", -4, 4) + HelpFrameReportBugScrollFrameScrollBar.Panel:SetPoint("BOTTOMRIGHT", 6, -4) for d = 1, HelpFrameReportBug:GetNumChildren()do local e = select(d, HelpFrameReportBug:GetChildren()) if not e:GetName() then @@ -84,10 +84,10 @@ local function HelpFrameStyle() end end SV.API:Set("ScrollBar", HelpFrameReportBugScrollFrame) - HelpFrameSubmitSuggestionScrollFrame:RemoveTextures() - HelpFrameSubmitSuggestionScrollFrame:SetStyle("Frame", "Default") - HelpFrameSubmitSuggestionScrollFrame.Panel:SetPoint("TOPLEFT", -4, 4) - HelpFrameSubmitSuggestionScrollFrame.Panel:SetPoint("BOTTOMRIGHT", 6, -4) + HelpFrameSubmitSuggestionScrollFrameScrollBar:RemoveTextures() + HelpFrameSubmitSuggestionScrollFrameScrollBar:SetStyle("Frame", "Default") + HelpFrameSubmitSuggestionScrollFrameScrollBar.Panel:SetPoint("TOPLEFT", -4, 4) + HelpFrameSubmitSuggestionScrollFrameScrollBar.Panel:SetPoint("BOTTOMRIGHT", 6, -4) for d = 1, HelpFrameSubmitSuggestion:GetNumChildren()do local e = select(d, HelpFrameSubmitSuggestion:GetChildren()) if not e:GetName() then @@ -159,10 +159,10 @@ local function HelpFrameStyle() if(_G['HelpFrameTicket']) then if(_G['HelpFrameTicketScrollFrame']) then - HelpFrameTicketScrollFrame:RemoveTextures() - HelpFrameTicketScrollFrame:SetStyle("Frame", "Default") - HelpFrameTicketScrollFrame.Panel:SetPoint("TOPLEFT", -4, 4) - HelpFrameTicketScrollFrame.Panel:SetPoint("BOTTOMRIGHT", 6, -4) + HelpFrameTicketScrollFrameScrollBar:RemoveTextures() + HelpFrameTicketScrollFrameScrollBar:SetStyle("Frame", "Default") + HelpFrameTicketScrollFrameScrollBar.Panel:SetPoint("TOPLEFT", -4, 4) + HelpFrameTicketScrollFrameScrollBar.Panel:SetPoint("BOTTOMRIGHT", 6, -4) end for d = 1, HelpFrameTicket:GetNumChildren()do local e = select(d, HelpFrameTicket:GetChildren()) @@ -178,4 +178,4 @@ end MOD LOADING ########################################################## ]]-- -MOD:SaveCustomStyle(HelpFrameStyle) \ No newline at end of file +MOD:SaveCustomStyle("HELP", HelpFrameStyle) \ No newline at end of file diff --git a/SVUI_Skins/components/blizzard/itemsocketing.lua b/SVUI_Skins/components/blizzard/itemsocketing.lua index 3175302..4fbe1e4 100644 --- a/SVUI_Skins/components/blizzard/itemsocketing.lua +++ b/SVUI_Skins/components/blizzard/itemsocketing.lua @@ -22,8 +22,8 @@ local function ItemSocketStyle() ItemSocketingFrame:RemoveTextures() ItemSocketingFrame:SetStyle("Frame", "Window2") ItemSocketingFrameInset:Die() - ItemSocketingScrollFrame:RemoveTextures() - ItemSocketingScrollFrame:SetStyle("Frame", "Inset", true) + ItemSocketingScrollFrameScrollBar:RemoveTextures() + ItemSocketingScrollFrameScrollBar:SetStyle("Frame", "Inset", true) SV.API:Set("ScrollBar", ItemSocketingScrollFrame, 2) for j = 1, MAX_NUM_SOCKETS do local i = _G[("ItemSocketingSocket%d"):format(j)]; diff --git a/SVUI_Skins/components/blizzard/lfd.lua b/SVUI_Skins/components/blizzard/lfd.lua index d217bc5..a92c0c0 100644 --- a/SVUI_Skins/components/blizzard/lfd.lua +++ b/SVUI_Skins/components/blizzard/lfd.lua @@ -347,7 +347,7 @@ local function LFDFrameStyle() LFDParentFrame:RemoveTextures() LFDQueueFrameFindGroupButton:RemoveTextures() LFDParentFrameInset:RemoveTextures() - LFDQueueFrameSpecificListScrollFrame:RemoveTextures() + --LFDQueueFrameSpecificListScrollFrameScrollBar:RemoveTextures() LFDQueueFrameFindGroupButton:SetStyle("Button") hooksecurefunc("LFDQueueFrameRandom_UpdateFrame", LFDQueueRandom_OnUpdate) @@ -356,8 +356,8 @@ local function LFDFrameStyle() RaidFinderFrame:RemoveTextures() RaidFinderFrameBottomInset:RemoveTextures() RaidFinderFrameRoleInset:RemoveTextures() - LFDQueueFrameRandomScrollFrame:RemoveTextures() - ScenarioQueueFrameSpecificScrollFrame:RemoveTextures() + --LFDQueueFrameRandomScrollFrameScrollBar:RemoveTextures() + --ScenarioQueueFrameSpecificScrollFrameScrollBar:RemoveTextures() RaidFinderFrameBottomInsetBg:Hide() RaidFinderFrameBtnCornerRight:Hide() RaidFinderFrameButtonBottomBorder:Hide() @@ -472,9 +472,9 @@ local function LFDFrameStyle() SV.API:Set("ScrollBar", LFDQueueFrameRandomScrollFrame) SV.API:Set("ScrollBar", ScenarioQueueFrameSpecificScrollFrame) - LFDQueueFrameRandomScrollFrame:SetStyle("Frame", 'Transparent') - ScenarioQueueFrameRandomScrollFrame:SetStyle("Frame", 'Transparent') - RaidFinderQueueFrameScrollFrame:SetStyle("Frame", 'Transparent') + LFDQueueFrameRandomScrollFrameScrollBar:SetStyle("Frame", 'Transparent') + ScenarioQueueFrameRandomScrollFrameScrollBar:SetStyle("Frame", 'Transparent') + RaidFinderQueueFrameScrollFrameScrollBar:SetStyle("Frame", 'Transparent') -- for u = 1, NUM_LFD_CHOICE_BUTTONS do -- local box = _G["LFDQueueFrameSpecificListButton"..u.."EnableButton"] @@ -528,4 +528,4 @@ end MOD LOADING ########################################################## ]]-- -MOD:SaveCustomStyle(LFDFrameStyle) +MOD:SaveCustomStyle("LFD", LFDFrameStyle) diff --git a/SVUI_Skins/components/blizzard/macro.lua b/SVUI_Skins/components/blizzard/macro.lua index b8f357b..9b18a20 100644 --- a/SVUI_Skins/components/blizzard/macro.lua +++ b/SVUI_Skins/components/blizzard/macro.lua @@ -82,10 +82,10 @@ local function MacroUIStyle() MacroPopupFrame:RemoveTextures() MacroPopupFrame:SetStyle("Frame", 'Transparent') - MacroPopupScrollFrame:RemoveTextures() - MacroPopupScrollFrame:SetStyle("Frame", "Pattern") - MacroPopupScrollFrame.Panel:SetPoint("TOPLEFT", 51, 2) - MacroPopupScrollFrame.Panel:SetPoint("BOTTOMRIGHT", -4, 4) + MacroPopupScrollFrameScrollBar:RemoveTextures() + MacroPopupScrollFrameScrollBar:SetStyle("Frame", "Pattern") + MacroPopupScrollFrameScrollBar.Panel:SetPoint("TOPLEFT", 51, 2) + MacroPopupScrollFrameScrollBar.Panel:SetPoint("BOTTOMRIGHT", -4, 4) MacroPopupEditBox:SetStyle("Editbox") MacroPopupNameLeft:SetTexture("") MacroPopupNameMiddle:SetTexture("") @@ -95,7 +95,7 @@ local function MacroUIStyle() MacroButtonContainer:RemoveTextures() SV.API:Set("ScrollBar", MacroButtonScrollFrame) - MacroButtonScrollFrame:SetStyle("!_Frame", "Inset") + MacroButtonScrollFrameScrollBar:SetStyle("!_Frame", "Inset") MacroPopupFrame:HookScript("OnShow", function(c) c:ClearAllPoints() diff --git a/SVUI_Skins/components/blizzard/misc.lua b/SVUI_Skins/components/blizzard/misc.lua index dc4f120..213fd0f 100644 --- a/SVUI_Skins/components/blizzard/misc.lua +++ b/SVUI_Skins/components/blizzard/misc.lua @@ -213,7 +213,7 @@ local function MiscStyles() SV.API:Set("Window", GossipFrame, true, true) ItemTextFrame:RemoveTextures(true) - ItemTextScrollFrame:RemoveTextures() + ItemTextScrollFrameScrollBar:RemoveTextures() SV.API:Set("CloseButton", GossipFrameCloseButton) SV.API:Set("PageButton", ItemTextPrevPageButton, false, true) SV.API:Set("PageButton", ItemTextNextPageButton) @@ -227,13 +227,13 @@ local function MiscStyles() ItemTextFrameInset:Die() SV.API:Set("ScrollBar", ItemTextScrollFrame) SV.API:Set("CloseButton", ItemTextFrameCloseButton) - local r = {"GossipFrameGreetingPanel", "GossipFrameInset", "GossipGreetingScrollFrame"} + local r = {"GossipFrameGreetingPanel", "GossipFrameInset", "GossipGreetingScrollFrameScrollBar"} SV.API:Set("ScrollBar", GossipGreetingScrollFrame) for s, t in pairs(r)do _G[t]:RemoveTextures() end GossipFrame:SetStyle("Frame", "Window") - GossipGreetingScrollFrame:SetStyle("!_Frame", "Inset", true) + GossipGreetingScrollFrameScrollBar:SetStyle("!_Frame", "Inset", true) GossipGreetingScrollFrame.spellTex = GossipGreetingScrollFrame:CreateTexture(nil, "ARTWORK") GossipGreetingScrollFrame.spellTex:SetTexture([[Interface\QuestFrame\QuestBG]]) GossipGreetingScrollFrame.spellTex:SetPoint("TOPLEFT", 2, -2) @@ -332,7 +332,7 @@ local function MiscStyles() txt:SetJustifyH("CENTER") txt:SetText("RESIZE") - LootHistoryFrameScrollFrame:RemoveTextures() + LootHistoryFrameScrollFrameScrollBar:RemoveTextures() SV.API:Set("ScrollBar", LootHistoryFrameScrollFrame) hooksecurefunc("LootHistoryFrame_FullUpdate", LootHistoryFrame_OnUpdate) @@ -378,8 +378,8 @@ local function MiscStyles() SV.API:Set("Tab", MailFrameTab1) SV.API:Set("Tab", MailFrameTab2) - SendMailScrollFrame:RemoveTextures(true) - SendMailScrollFrame:SetStyle("!_Frame", "Inset") + SendMailScrollFrameScrollBar:RemoveTextures(true) + SendMailScrollFrameScrollBar:SetStyle("!_Frame", "Inset") SV.API:Set("ScrollBar", SendMailScrollFrame) SendMailNameEditBox:SetStyle("Editbox") @@ -418,8 +418,8 @@ local function MiscStyles() SV.API:Set("CloseButton", OpenMailFrameCloseButton) - OpenMailScrollFrame:RemoveTextures(true) - OpenMailScrollFrame:SetStyle("!_Frame", "Default") + OpenMailScrollFrameScrollBar:RemoveTextures(true) + OpenMailScrollFrameScrollBar:SetStyle("!_Frame", "Default") SV.API:Set("ScrollBar", OpenMailScrollFrame) SendMailBodyEditBox:SetTextColor(1, 1, 1) @@ -730,7 +730,7 @@ local function MiscStyles() end if(SV.db.Skins.blizzard.bgscore) then - WorldStateScoreScrollFrame:RemoveTextures() + WorldStateScoreScrollFrameScrollBar:RemoveTextures() WorldStateScoreFrame:RemoveTextures() WorldStateScoreFrame:SetStyle("Frame", "Window") SV.API:Set("CloseButton", WorldStateScoreFrameCloseButton) @@ -752,4 +752,4 @@ end MOD LOADING ########################################################## ]]-- -MOD:SaveCustomStyle(MiscStyles) +MOD:SaveCustomStyle("MISC", MiscStyles) diff --git a/SVUI_Skins/components/blizzard/pvp.lua b/SVUI_Skins/components/blizzard/pvp.lua index 0cc9a7e..0f1aef5 100644 --- a/SVUI_Skins/components/blizzard/pvp.lua +++ b/SVUI_Skins/components/blizzard/pvp.lua @@ -90,9 +90,9 @@ local function PVPFrameStyle() local ConquestPointsBar = _G.ConquestPointsBar; ConquestFrame.Inset:RemoveTextures() - ConquestPoints.XPBar:RemoveTextures() - ConquestPoints.XPBar:SetStyle("!_Frame", 'Inset') - ConquestPoints.XPBar.Panel:WrapPoints(ConquestPointsBar, nil, -2) + -- ConquestPoints.XPBar:RemoveTextures() + -- ConquestPoints.XPBar:SetStyle("!_Frame", 'Inset') + -- ConquestPoints.XPBar.Panel:WrapPoints(ConquestPointsBar, nil, -2) --[[ ConquestPointsBarLeft:Die() ConquestPointsBarRight:Die() @@ -114,7 +114,7 @@ local function PVPFrameStyle() ConquestFrame.RatedBG.SelectedTexture:SetColorTexture(1, 1, 0, 0.1) WarGamesFrame:RemoveTextures() WarGamesFrame.RightInset:RemoveTextures() - WarGamesFrameInfoScrollFrame:RemoveTextures() + WarGamesFrameInfoScrollFrameScrollBar:RemoveTextures() WarGamesFrameInfoScrollFrameScrollBar:RemoveTextures() WarGameStartButton:RemoveTextures() WarGameStartButton:SetStyle("Button") @@ -131,7 +131,7 @@ local function PVPFrameStyle() PVPReadyDialogRoleIconTexture:SetAlpha(0.5) ConquestFrame.Inset:SetStyle("!_Frame", "Inset") - WarGamesFrameScrollFrame:SetStyle("Frame", "Inset",false,2,2,6) + WarGamesFrameScrollFrameScrollBar:SetStyle("Frame", "Inset",false,2,2,6) hooksecurefunc("PVPReadyDialog_Display", _hook_PVPReadyDialogDisplay) end diff --git a/SVUI_Skins/components/blizzard/quest.lua b/SVUI_Skins/components/blizzard/quest.lua index 38a1df1..aa9617a 100644 --- a/SVUI_Skins/components/blizzard/quest.lua +++ b/SVUI_Skins/components/blizzard/quest.lua @@ -97,7 +97,7 @@ end local _hook_QuestLogPopupDetailFrameShow = function(self) local QuestLogPopupDetailFrameScrollFrame = _G.QuestLogPopupDetailFrameScrollFrame; if not QuestLogPopupDetailFrameScrollFrame.spellTex then - QuestLogPopupDetailFrameScrollFrame:SetStyle("!_Frame", "Default") + QuestLogPopupDetailFrameScrollFrameScrollBar:SetStyle("!_Frame", "Default") QuestLogPopupDetailFrameScrollFrame.spellTex = QuestLogPopupDetailFrameScrollFrame:CreateTexture(nil, 'ARTWORK') QuestLogPopupDetailFrameScrollFrame.spellTex:SetTexture([[Interface\QuestFrame\QuestBookBG]]) QuestLogPopupDetailFrameScrollFrame.spellTex:SetPoint("TOPLEFT", 2, -2) @@ -120,8 +120,8 @@ local function QuestFrameStyle() SV.API:Set("Window", QuestLogPopupDetailFrame, true, true) SV.API:Set("Window", QuestFrame, true, true) - QuestLogPopupDetailFrameScrollFrame:RemoveTextures() - QuestProgressScrollFrame:RemoveTextures() + QuestLogPopupDetailFrameScrollFrameScrollBar:RemoveTextures() + QuestProgressScrollFrameScrollBar:RemoveTextures() QuestInfoItemHighlight:RemoveTextures() QuestInfoItemHighlight:SetStyle("Frame", "Icon") @@ -152,7 +152,7 @@ local function QuestFrameStyle() SV.API:Set("ScrollBar", QuestLogPopupDetailFrameScrollFrame, 5) SV.API:Set("ScrollBar", QuestRewardScrollFrame) - QuestGreetingScrollFrame:RemoveTextures() + QuestGreetingScrollFrameScrollBar:RemoveTextures() SV.API:Set("ScrollBar", QuestGreetingScrollFrame) for i = 1, 10 do @@ -185,14 +185,14 @@ local function QuestFrameStyle() QuestFrameInset:Die() QuestFrameDetailPanel:RemoveTextures(true) - QuestDetailScrollFrame:RemoveTextures(true) - QuestScrollHelper(QuestDetailScrollFrame, 506, 615, true) - QuestProgressScrollFrame:SetStyle("!_Frame") - QuestScrollHelper(QuestProgressScrollFrame, 506, 615, true) - QuestGreetingScrollFrame:SetStyle("!_Frame") - QuestScrollHelper(QuestGreetingScrollFrame, 506, 615, 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) - QuestRewardScrollFrame:RemoveTextures(true) + QuestRewardScrollFrameScrollBar:RemoveTextures(true) QuestRewardScrollChildFrame:RemoveTextures(true) QuestFrameProgressPanel:RemoveTextures(true) QuestFrameRewardPanel:RemoveTextures(true) @@ -260,5 +260,5 @@ end MOD LOADING ########################################################## ]]-- -MOD:SaveCustomStyle(QuestFrameStyle) +MOD:SaveCustomStyle("QUEST", QuestFrameStyle) MOD:SaveBlizzardStyle('Blizzard_QuestChoice', QuestChoiceFrameStyle) diff --git a/SVUI_Skins/components/blizzard/raid.lua b/SVUI_Skins/components/blizzard/raid.lua index b63d624..48538e1 100644 --- a/SVUI_Skins/components/blizzard/raid.lua +++ b/SVUI_Skins/components/blizzard/raid.lua @@ -80,7 +80,7 @@ local function RaidInfoStyle() end end - RaidInfoScrollFrame:RemoveTextures() + RaidInfoScrollFrameScrollBar:RemoveTextures() RaidInfoFrame:SetStyle("Frame", 'Transparent') RaidInfoFrame.Panel:SetPoint("TOPLEFT", RaidInfoFrame, "TOPLEFT") RaidInfoFrame.Panel:SetPoint("BOTTOMRIGHT", RaidInfoFrame, "BOTTOMRIGHT") @@ -97,4 +97,4 @@ MOD LOADING ########################################################## ]]-- MOD:SaveBlizzardStyle("Blizzard_RaidUI", RaidUIStyle) -MOD:SaveCustomStyle(RaidInfoStyle) \ No newline at end of file +MOD:SaveCustomStyle("RAIDINFO", RaidInfoStyle) \ No newline at end of file diff --git a/SVUI_Skins/components/blizzard/spellbook.lua b/SVUI_Skins/components/blizzard/spellbook.lua index 3d937c9..d9b09e2 100644 --- a/SVUI_Skins/components/blizzard/spellbook.lua +++ b/SVUI_Skins/components/blizzard/spellbook.lua @@ -322,4 +322,4 @@ end MOD LOADING ########################################################## ]]-- -MOD:SaveCustomStyle(SpellBookStyle) +MOD:SaveCustomStyle("SPELLBOOK", SpellBookStyle) diff --git a/SVUI_Skins/components/blizzard/system.lua b/SVUI_Skins/components/blizzard/system.lua index 636a71a..b6af0cc 100644 --- a/SVUI_Skins/components/blizzard/system.lua +++ b/SVUI_Skins/components/blizzard/system.lua @@ -782,4 +782,4 @@ end MOD LOADING ########################################################## ]]-- -MOD:SaveCustomStyle(SystemPanelQue) +MOD:SaveCustomStyle("SYSTEM", SystemPanelQue) diff --git a/SVUI_Skins/components/blizzard/talents.lua b/SVUI_Skins/components/blizzard/talents.lua index 8775e8a..9240af0 100644 --- a/SVUI_Skins/components/blizzard/talents.lua +++ b/SVUI_Skins/components/blizzard/talents.lua @@ -233,7 +233,7 @@ local function GlyphStyle() if(GlyphFrameSideInset) then GlyphFrameSideInset:RemoveTextures() end if(GlyphFrameHeader1) then GlyphFrameHeader1:RemoveTextures() end if(GlyphFrameHeader2) then GlyphFrameHeader2:RemoveTextures() end - if(GlyphFrameScrollFrame) then GlyphFrameScrollFrame:SetStyle("Frame", "Inset", false, 3, 2, 2) end + if(GlyphFrameScrollFrame) then GlyphFrameScrollFrameScrollBar:SetStyle("Frame", "Inset", false, 3, 2, 2) end if(GlyphFrameSearchBox) then GlyphFrameSearchBox:SetStyle("Editbox") end if(GlyphFrameClearInfoFrame and GlyphFrameClearInfoFrame.icon) then diff --git a/SVUI_Skins/components/blizzard/trainer.lua b/SVUI_Skins/components/blizzard/trainer.lua index baf5f12..6e56742 100644 --- a/SVUI_Skins/components/blizzard/trainer.lua +++ b/SVUI_Skins/components/blizzard/trainer.lua @@ -68,7 +68,7 @@ local function TrainerStyle() _G["ClassTrainerTrainButton"]:RemoveTextures() _G["ClassTrainerTrainButton"]:SetStyle("Button") SV.API:Set("DropDown", ClassTrainerFrameFilterDropDown, 155) - ClassTrainerScrollFrame:SetStyle("!_Frame", "Inset") + ClassTrainerScrollFrameScrollBar:SetStyle("!_Frame", "Inset") SV.API:Set("CloseButton", ClassTrainerFrameCloseButton, ClassTrainerFrame) ClassTrainerFrameSkillStepButton.icon:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) ClassTrainerFrameSkillStepButton:SetStyle("!_Frame", "Button", true) diff --git a/SVUI_Skins/components/blizzard/worldmap.lua b/SVUI_Skins/components/blizzard/worldmap.lua index 7e9397b..0764180 100644 --- a/SVUI_Skins/components/blizzard/worldmap.lua +++ b/SVUI_Skins/components/blizzard/worldmap.lua @@ -22,11 +22,11 @@ local function AdjustMapLevel() local WorldMapFrame = _G.WorldMapFrame; WorldMapFrame:SetFrameStrata("HIGH"); WorldMapTooltip:SetFrameStrata("TOOLTIP"); - WorldMapPlayerLower:SetFrameStrata("MEDIUM"); - WorldMapPlayerLower:SetFrameStrata("FULLSCREEN"); + --WorldMapPlayerLower:SetFrameStrata("MEDIUM"); + --WorldMapPlayerLower:SetFrameStrata("FULLSCREEN"); WorldMapFrame:SetFrameLevel(1) WorldMapDetailFrame:SetFrameLevel(2) - WorldMapArchaeologyDigSites:SetFrameLevel(3) + --WorldMapArchaeologyDigSites:SetFrameLevel(3) end local function WorldMap_SmallView() @@ -67,7 +67,7 @@ local function StripQuestMapFrame() --print('test StripQuestMapFrame 2') QuestMapFrame:RemoveTextures(true) QuestMapFrame.DetailsFrame:RemoveTextures(true) - QuestScrollFrame:RemoveTextures(true) + --QuestScrollFrameScrollBar:RemoveTextures(true) --QuestScrollFrame.ViewAll:RemoveTextures(true) --print('test StripQuestMapFrame 3') QuestMapFrame.DetailsFrame.CompleteQuestFrame:RemoveTextures(true) @@ -88,7 +88,7 @@ local function StripQuestMapFrame() SV.API:Set("ScrollBar", QuestMapDetailsScrollFrame) SV.API:Set("Skin", QuestMapFrame.DetailsFrame.RewardsFrame, 0, -10, 0, 0) - QuestScrollFrame:SetStyle("Frame", "Paper") + --QuestScrollFrameScrollBar:SetStyle("Frame", "Paper") --QuestScrollFrame.ViewAll:SetStyle("Button") --print('test StripQuestMapFrame 5') local detailWidth = QuestMapFrame.DetailsFrame.RewardsFrame:GetWidth() @@ -185,7 +185,7 @@ end MOD LOADING ########################################################## ]]-- -MOD:SaveCustomStyle(WorldMapStyle) +MOD:SaveCustomStyle("WORLDMAP", WorldMapStyle) --[[ function ArchaeologyDigSiteFrame_OnUpdate() diff --git a/SVUI_Tooltip/SVUI_Tooltip.toc b/SVUI_Tooltip/SVUI_Tooltip.toc index 1e7f4e7..ac01d87 100644 --- a/SVUI_Tooltip/SVUI_Tooltip.toc +++ b/SVUI_Tooltip/SVUI_Tooltip.toc @@ -1,4 +1,4 @@ -## Interface: 70000 +## Interface: 70100 ## Author: Failcoder ## Version: 1.3.5 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00Tooltip|r diff --git a/SVUI_UnitFrames/SVUI_UnitFrames.toc b/SVUI_UnitFrames/SVUI_UnitFrames.toc index ff9df79..7025dcb 100644 --- a/SVUI_UnitFrames/SVUI_UnitFrames.toc +++ b/SVUI_UnitFrames/SVUI_UnitFrames.toc @@ -1,4 +1,4 @@ -## Interface: 70000 +## Interface: 70100 ## Author: Failcoder ## Version: 1.3.5 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00UnitFrames|r