diff --git a/SVUI_!Core/SVUI_!Core.toc b/SVUI_!Core/SVUI_!Core.toc index 078ecb9..57ca3a1 100644 --- a/SVUI_!Core/SVUI_!Core.toc +++ b/SVUI_!Core/SVUI_!Core.toc @@ -5,7 +5,7 @@ ## Notes: SVUI [|cff9911FFCore Framework|r]. ## SavedVariables: SVUI_Global, SVUI_Errors, SVUI_Filters, SVUI_Media ## SavedVariablesPerCharacter: SVUI_Private -## OptionalDeps: Blizzard_DebugTools, LibSharedMedia-3.0 +## OptionalDeps: LibSharedMedia-3.0 ## X-SVUIName: SVUI ## X-SVUISchema: Core ## X-Email: munglunch@gmail.com diff --git a/SVUI_!Core/assets/backgrounds/unit/UNIT-BG14.blp b/SVUI_!Core/assets/backgrounds/unit/UNIT-BG14.blp new file mode 100644 index 0000000..89a3a00 Binary files /dev/null and b/SVUI_!Core/assets/backgrounds/unit/UNIT-BG14.blp differ diff --git a/SVUI_!Core/assets/backgrounds/unit/UNIT-BG15.blp b/SVUI_!Core/assets/backgrounds/unit/UNIT-BG15.blp new file mode 100644 index 0000000..8570677 Binary files /dev/null and b/SVUI_!Core/assets/backgrounds/unit/UNIT-BG15.blp differ diff --git a/SVUI_!Core/assets/backgrounds/unit/UNIT-BG16.blp b/SVUI_!Core/assets/backgrounds/unit/UNIT-BG16.blp new file mode 100644 index 0000000..a91bbf2 Binary files /dev/null and b/SVUI_!Core/assets/backgrounds/unit/UNIT-BG16.blp differ diff --git a/SVUI_!Core/assets/backgrounds/unit/UNIT-BG17.blp b/SVUI_!Core/assets/backgrounds/unit/UNIT-BG17.blp new file mode 100644 index 0000000..46ae5f5 Binary files /dev/null and b/SVUI_!Core/assets/backgrounds/unit/UNIT-BG17.blp differ diff --git a/SVUI_!Core/assets/backgrounds/unit/UNIT-SMALL-BG14.blp b/SVUI_!Core/assets/backgrounds/unit/UNIT-SMALL-BG14.blp new file mode 100644 index 0000000..920a585 Binary files /dev/null and b/SVUI_!Core/assets/backgrounds/unit/UNIT-SMALL-BG14.blp differ diff --git a/SVUI_!Core/assets/backgrounds/unit/UNIT-SMALL-BG15.blp b/SVUI_!Core/assets/backgrounds/unit/UNIT-SMALL-BG15.blp new file mode 100644 index 0000000..42e00b1 Binary files /dev/null and b/SVUI_!Core/assets/backgrounds/unit/UNIT-SMALL-BG15.blp differ diff --git a/SVUI_!Core/assets/backgrounds/unit/UNIT-SMALL-BG16.blp b/SVUI_!Core/assets/backgrounds/unit/UNIT-SMALL-BG16.blp new file mode 100644 index 0000000..2b97e37 Binary files /dev/null and b/SVUI_!Core/assets/backgrounds/unit/UNIT-SMALL-BG16.blp differ diff --git a/SVUI_!Core/assets/backgrounds/unit/UNIT-SMALL-BG17.blp b/SVUI_!Core/assets/backgrounds/unit/UNIT-SMALL-BG17.blp new file mode 100644 index 0000000..7b8f99b Binary files /dev/null and b/SVUI_!Core/assets/backgrounds/unit/UNIT-SMALL-BG17.blp differ diff --git a/SVUI_!Core/system/api.lua b/SVUI_!Core/system/api.lua index bc23153..e8bd352 100644 --- a/SVUI_!Core/system/api.lua +++ b/SVUI_!Core/system/api.lua @@ -845,6 +845,13 @@ function MOD:APPLY(frame, templateName, underlay, padding, xOffset, yOffset, def end end + if(panel.TopLeft and (not underlay)) then + panel.TopLeft:SetParent(frame) + panel.TopRight:SetParent(frame) + panel.BottomLeft:SetParent(frame) + panel.BottomRight:SetParent(frame) + end + frame.Panel = panel; end --[[ @@ -1118,6 +1125,7 @@ local SetPanelColor = function(self, ...) if(arg1 == "VERTICAL" or arg1 == "HORIZONTAL") then self.Panel.Skin:SetGradient(...) elseif(SV.media.gradient[arg1]) then + self.Panel:SetAttribute("panelColor", arg1) self.Panel.Skin:SetGradient(unpack(SV.media.gradient[arg1])) if(SV.media.color[arg1]) then local t = SV.media.color[arg1] @@ -1127,6 +1135,7 @@ local SetPanelColor = function(self, ...) end elseif(type(arg1) == "string" and SV.media.color[arg1]) then local t = SV.media.color[arg1] + self.Panel:SetAttribute("panelColor", arg1) self:SetBackdropColor(t[1], t[2], t[3], t[4]) elseif(arg1 and type(arg1) == "number") then self:SetBackdropColor(...) @@ -1672,11 +1681,17 @@ MOD.Concepts["PageButton"] = function(self, adjustable, frame, isVertical, isLef end end -MOD.Concepts["ScrollFrame"] = function(self, adjustable, frame, scale, yOffset) +MOD.Concepts["ScrollBar"] = function(self, adjustable, frame, scale, yOffset) if(not frame or (frame and frame.Panel)) then return end scale = scale or 5 local scrollName = frame:GetName() + local testForBar = _G[("%sScrollBar"):format(scrollName)] + if(testForBar) then + scrollName = testForBar:GetName() + RemoveTextures(frame) + frame = testForBar + end local bg, track, top, bottom, mid, upButton, downButton bg = _G[("%sBG"):format(scrollName)] if(bg) then bg:SetTexture("") end @@ -1733,32 +1748,28 @@ MOD.Concepts["ScrollFrame"] = function(self, adjustable, frame, scale, yOffset) if(frame.SetThumbTexture) then frame:SetThumbTexture(SV.media.button.knob) end - end -end - -MOD.Concepts["ScrollBar"] = function(self, adjustable, frame) - if(not frame or (frame and (not frame.GetOrientation or frame.Panel))) then return end - - if(frame:GetOrientation() == "VERTICAL") then - frame:SetWidth(12) - else - frame:SetHeight(12) - for i=1, frame:GetNumRegions() do - local child = select(i, frame:GetRegions()) - if(child and child:GetObjectType() == "FontString") then - local anchor, parent, relative, x, y = child:GetPoint() - if relative:find("BOTTOM") then - child:SetPoint(anchor, parent, relative, x, y - 4) + elseif(frame.GetOrientation) then + if(frame:GetOrientation() == "VERTICAL") then + frame:SetWidth(12) + else + frame:SetHeight(12) + for i=1, frame:GetNumRegions() do + local child = select(i, frame:GetRegions()) + if(child and child:GetObjectType() == "FontString") then + local anchor, parent, relative, x, y = child:GetPoint() + if relative:find("BOTTOM") then + child:SetPoint(anchor, parent, relative, x, y - 4) + end end end end - end - RemoveTextures(frame) - frame:SetBackdrop(nil) - self.Methods["Frame"](self, frame, (not adjustable), "Transparent", true) - frame:SetBackdropBorderColor(0.2,0.2,0.2) - frame:SetThumbTexture(SV.media.button.knob) + RemoveTextures(frame) + frame:SetBackdrop(nil) + self.Methods["Frame"](self, frame, (not adjustable), "Transparent", true) + frame:SetBackdropBorderColor(0.2,0.2,0.2) + frame:SetThumbTexture(SV.media.button.knob) + end end MOD.Concepts["Tab"] = function(self, adjustable, frame, addBackground, xOffset, yOffset) diff --git a/SVUI_!Core/system/credits.lua b/SVUI_!Core/system/credits.lua index fe3d21d..5f54e7a 100644 --- a/SVUI_!Core/system/credits.lua +++ b/SVUI_!Core/system/credits.lua @@ -24,7 +24,11 @@ local PRINTED_TEMPLATE = [[ |cffff9900CODE GRANTS BY:|r Azilroka, Sortokk, Kkthnx |cff4f4f4f---------------------------------------------|r -|cffff9900SPECIAL THANKS TO: |r|cfff81422Cairenn|r |cff2288cc(@WowInterface.com)|r ..the most patient and accomodating person I know! +|cffff9900SPECIAL THANKS TO: +|r|cfff81422Cairenn|r |cff2288cc(@WowInterface.com)|r ..the most patient and accomodating person I know! +|r|cfff81422Panser|r |cff2288cc(@TradeChat)|r ..for all the re-tweets and favorites! |cff555555(now if I can get you to actually use this UI...)|r +|r|cfff81422Synnistry|r and |cfff81422MetaGoblin|r ..for giving this project life in your videos! +|r|cfff81422Panda Co Live!|r and |cfff81422WoWProfitz|r ..for giving this project life in your streams! |cffff9900A VERY SPECIAL THANKS TO: |r|cffffff00Movster|r ..who inspired me to bring this project back to life! |cff4f4f4f---------------------------------------------|r @@ -51,7 +55,7 @@ Other Silent Partners.. (Let me know if I have forgotten you) |cffaa33ffMINIONS (aka COMMUNITY TESTERS):|r %s -The Wowinterface Community +The Wowinterface and Curse Community |cff4f4f4f---------------------------------------------|r |cff00ccffTheme Song By: Fingathing [taken from the song: SuperHero Music]|r @@ -104,7 +108,8 @@ SV.Credits["community"] = { "Trendkill09", "Luamar", "Zharooz", "Lyn3x5", "Madh4tt3r", "Xarioth", "AtomicKiller", "Meljen", "Moondoggy", "Stormblade", "Schreibstift", "Anj", "Risien", "Cromax", "Nitro_Turtle", - "Shinzou", "Autolykus", "Taotao", "ColorsGaming", "Necroo" + "Shinzou", "Autolykus", "Taotao", "ColorsGaming", "Necroo", "Panser (TradeChat)", + "Synnistry", "MetaGoblin", "Panda Co Live!" }; local LIST_PATTERN = " %s\n %s\n %s\n %s"; diff --git a/SVUI_!Core/system/debug.lua b/SVUI_!Core/system/debug.lua index bc71dff..5301cc9 100644 --- a/SVUI_!Core/system/debug.lua +++ b/SVUI_!Core/system/debug.lua @@ -1,7 +1,7 @@ --[[ ############################################################################## S V U I By: Munglunch -############################################################################## ]]-- +############################################################################## ]]-- --[[ GLOBALS ]]-- local _G = _G; local unpack = _G.unpack; @@ -33,8 +33,8 @@ local floor, abs, min, max = math.floor, math.abs, math.min, math.max; --[[ TABLE METHODS ]]-- local tremove, tcopy, twipe, tsort, tconcat = table.remove, table.copy, table.wipe, table.sort, table.concat; local tprint = table.tostring; ---[[ -########################################################## +--[[ +########################################################## GET ADDON DATA ########################################################## ]]-- @@ -46,8 +46,8 @@ local ScriptErrorScrollBar = _G["SVUI_ScriptErrorDialogScrollBar"]; local DevTools_Dump = _G.DevTools_Dump; local DevTools_RunDump = _G.DevTools_RunDump; ---[[ -########################################################## +--[[ +########################################################## CUSTOM MESSAGE WINDOW ########################################################## ]]-- @@ -59,7 +59,7 @@ local ScriptError_OnShow = function(self) end local ScriptError_OnTextChanged = function(self, userInput) - if userInput then return end + if userInput then return end local _, max = ScriptErrorScrollBar:GetMinMaxValues() for i = 1, max do ScrollFrameTemplate_OnMouseWheel(ScriptErrorDialog, -1) @@ -79,22 +79,22 @@ local function getOriginalContext() end local function formatValueString(value) - if "string" == type(value) then + if "string" == type(value) then value = gsub(value,"\n","\\n") - if match(gsub(value,"[^'\"]",""),'^"+$') then - return "'"..value.."'"; - else + if match(gsub(value,"[^'\"]",""),'^"+$') then + return "'"..value.."'"; + else return '"'..gsub(value,'"','\\"')..'"'; - end - else + end + else return tprint(value, true); end end local function formatKeyString(text) - if("string" == type(text) and match(text,"^[_%a][_%a%d]*$")) then + if("string" == type(text) and match(text,"^[_%a][_%a%d]*$")) then return text; - else + else return "["..formatValueString(text).."]"; end end @@ -115,7 +115,7 @@ end local function DebugDump(arg) if(arg == nil) then return "No Result" - elseif(type(arg) == "string") then + elseif(type(arg) == "string") then return arg elseif(type(arg) == "table") then loadDumpTable(arg) @@ -126,14 +126,14 @@ local function DebugDump(arg) -- context.Write = function(self, msg) -- buffer = buffer.."\n"..msg -- end - + -- DevTools_RunDump(arg, context) -- return buffer .. "\n" .. tableOutput(arg) -- else -- return tableOutput(arg) -- end - elseif(type(arg) == "number") then - return tostring(arg) + elseif(type(arg) == "number") then + return tostring(arg) end return arg end @@ -143,11 +143,11 @@ function SV.ScriptError:DebugOutput(msg) self:Show() end ScriptErrorDialog.Input:SetText(msg) -end +end function SV.ScriptError:TableDump(t) self:DebugOutput(tprint(t)) -end +end function SV.ScriptError:ShowDebug(header, ...) wipe(DUMPTABLE); @@ -159,7 +159,7 @@ function SV.ScriptError:ShowDebug(header, ...) local var; if(data.GetRegions) then var = DebugDump(data:GetRegions()) - else + else var = DebugDump(data) end value = format("%s [%d] = { %s\n }\n", value, i, var) @@ -364,14 +364,15 @@ local function InitializeScriptError() SV.ScriptError:SetStyle("!_Frame", "Transparent") SV.ScriptError.Clear:SetStyle("Button") SV.ScriptError:SetScript("OnShow", ScriptError_OnShow) + SV.API:Set("ScrollBar", SVUI_ScriptErrorDialogScrollBar) ScriptErrorDialog:SetStyle("!_Frame", "Transparent") ScriptErrorDialog.Input:SetScript("OnTextChanged", ScriptError_OnTextChanged) SV.ScriptError:RegisterForDrag("LeftButton"); end SV.Events:On("LOAD_ALL_ESSENTIALS", InitializeScriptError); ---[[ -########################################################## +--[[ +########################################################## REVEAL INTERNAL ERRORS ########################################################## ]]-- @@ -404,4 +405,24 @@ function SV:ResetErrors() end _G.SlashCmdList["SVUI_SHOW_ERRORS"] = _showErrors; -_G.SLASH_SVUI_SHOW_ERRORS1 = "/showerrors" \ No newline at end of file +_G.SLASH_SVUI_SHOW_ERRORS1 = "/showerrors" + +--[[ +########################################################## +FIX BAD INTERACTION WITH FSTACK +########################################################## +]]-- +_G.FrameStackTooltip_Toggle = function(showHidden, showRegions) + local tooltip = _G["FrameStackTooltip"]; + if ( tooltip:IsVisible() ) then + tooltip:Hide(); + FrameStackHighlight:Hide(); + else + tooltip:SetOwner(UIParent, "ANCHOR_NONE"); + tooltip:SetPoint("BOTTOMRIGHT", UIParent, "BOTTOMRIGHT", -CONTAINER_OFFSET_X - 13, CONTAINER_OFFSET_Y); + tooltip.default = 1; + tooltip.showRegions = showRegions; + tooltip.showHidden = showHidden; + local pass, catch = pcall(tooltip.SetFrameStack, tooltip, showHidden, showRegions) + end +end diff --git a/SVUI_!Core/system/media.lua b/SVUI_!Core/system/media.lua index 8d3287b..bc61ca7 100644 --- a/SVUI_!Core/system/media.lua +++ b/SVUI_!Core/system/media.lua @@ -44,7 +44,7 @@ local SV = select(2, ...) local SVUILib = Librarian("Registry") local L = SV.L local classToken = select(2,UnitClass("player")) -SV.MaxUnitBackdrops = 13; +SV.MaxUnitBackdrops = 17; --[[ ########################################################## DEFINE SOUND EFFECTS diff --git a/SVUI_!Core/xml/styles.xml b/SVUI_!Core/xml/styles.xml index ba1c1bb..6cf3c6a 100644 --- a/SVUI_!Core/xml/styles.xml +++ b/SVUI_!Core/xml/styles.xml @@ -418,7 +418,7 @@ <Attributes> <Attribute name="panelID" type="string" value="window" /> <Attribute name="panelPadding" type="number" value="2" /> - <Attribute name="panelColor" type="string" value="special" /> + <Attribute name="panelColor" type="string" value="specialdark" /> <Attribute name="panelGradient" type="boolean" value="false" /> <Attribute name="panelTexUpdate" type="boolean" value="false" /> <Attribute name="panelSkipUpdate" type="boolean" value="false" /> @@ -470,12 +470,12 @@ <Frame parentKey="Shadow" inherits="SVUI_ShadowTemplate" /> </Frames> </Frame> - + <Frame name="SVUI_CoreStyle_Window2" virtual="true"> <Attributes> <Attribute name="panelID" type="string" value="window2" /> <Attribute name="panelPadding" type="number" value="2" /> - <Attribute name="panelColor" type="string" value="special" /> + <Attribute name="panelColor" type="string" value="specialdark" /> <Attribute name="panelGradient" type="boolean" value="false" /> <Attribute name="panelTexUpdate" type="boolean" value="false" /> <Attribute name="panelSkipUpdate" type="boolean" value="false" /> @@ -573,7 +573,7 @@ </Layer> </Layers> </Frame> - + <Frame name="SVUI_CoreStyle_UnitSmall" virtual="true"> <Attributes> <Attribute name="panelID" type="string" value="unitsmall" /> @@ -591,4 +591,4 @@ </Layer> </Layers> </Frame> -</Ui> \ No newline at end of file +</Ui> diff --git a/SVUI_QuestTracker/SVUI_QuestTracker.lua b/SVUI_QuestTracker/SVUI_QuestTracker.lua index 009df7a..53dc50a 100644 --- a/SVUI_QuestTracker/SVUI_QuestTracker.lua +++ b/SVUI_QuestTracker/SVUI_QuestTracker.lua @@ -1,7 +1,7 @@ --[[ ########################################################## S V U I By: Munglunch -########################################################## +########################################################## LOCALIZED LUA FUNCTIONS ########################################################## ]]-- @@ -45,8 +45,8 @@ local RAID_CLASS_COLORS = _G.RAID_CLASS_COLORS; local CUSTOM_CLASS_COLORS = _G.CUSTOM_CLASS_COLORS; local GetTimeStringFromSeconds = _G.GetTimeStringFromSeconds; local GetQuestProgressBarPercent = _G.GetQuestProgressBarPercent; ---[[ -########################################################## +--[[ +########################################################## GET ADDON DATA ########################################################## ]]-- @@ -55,8 +55,8 @@ local L = SV.L local LSM = _G.LibStub("LibSharedMedia-3.0") local MOD = SV.QuestTracker; if(not MOD) then return end; ---[[ -########################################################## +--[[ +########################################################## LOCALS ########################################################## ]]-- @@ -68,8 +68,8 @@ local LARGE_INNER_HEIGHT = LARGE_ROW_HEIGHT - 4; local OBJ_ICON_ACTIVE = [[Interface\COMMON\Indicator-Yellow]]; local OBJ_ICON_COMPLETE = [[Interface\COMMON\Indicator-Green]]; local OBJ_ICON_INCOMPLETE = [[Interface\COMMON\Indicator-Gray]]; ---[[ -########################################################## +--[[ +########################################################## OBJECTIVE SCRIPT HANDLERS ########################################################## ]]-- @@ -101,8 +101,8 @@ end local OBJECTIVE_UpdateProgress = function(self, event, ...) if(not self.Status) then - self:UnregisterEvent("QUEST_LOG_UPDATE") - return + self:UnregisterEvent("QUEST_LOG_UPDATE") + return end local status = self.Status; local percent = 100; @@ -118,7 +118,7 @@ local OBJECTIVE_StartTimer = function(self, ...) local timeNow = GetTime(); local startTime = timeNow - elapsed; local timeRemaining = duration - startTime; - + local status = self:GetStatus(); status:FadeIn(); status.Bar.duration = duration or 1; @@ -147,8 +147,8 @@ end local OBJECTIVE_UpdateTimer = function(self, ...) if(not self.Status) then - self:SetScript("OnUpdate", nil); - return + self:SetScript("OnUpdate", nil); + return end local status = self.Status; local timeNow = GetTime(); @@ -191,7 +191,7 @@ local OBJECTIVE_GetStatus = function(self) local bgFrame = CreateFrame("Frame", nil, status.Bar) bgFrame:InsetPoints(status.Bar, -2, -2) bgFrame:SetFrameLevel(bgFrame:GetFrameLevel() - 1) - + bgFrame.bg = bgFrame:CreateTexture(nil, "BACKGROUND") bgFrame.bg:SetAllPoints(bgFrame) bgFrame.bg:SetTexture(SV.media.statusbar.default) @@ -238,8 +238,8 @@ local OBJECTIVE_GetStatus = function(self) return self.Status; end ---[[ -########################################################## +--[[ +########################################################## OBJECTIVE CONSTRUCTOR ########################################################## ]]-- @@ -276,8 +276,8 @@ function MOD:NewObjectiveRow(header, index) return objective; end ---[[ -########################################################## +--[[ +########################################################## OBJECTIVE HEADER METHODS ########################################################## ]]-- @@ -358,8 +358,8 @@ local OBJECTIVE_HEADER_SetProgress = function(self, index, ...) return index; end ---[[ -########################################################## +--[[ +########################################################## OBJECTIVE CONSTRUCTOR ########################################################## ]]-- @@ -375,15 +375,15 @@ function MOD:NewObjectiveHeader(parent) return header; end ---[[ -########################################################## +--[[ +########################################################## CORE FUNCTIONS ########################################################## ]]-- function MOD:GetTimerTextColor(duration, elapsed) local yellowPercent = .66 local redPercent = .33 - + local percentageLeft = 1 - ( elapsed / duration ) if(percentageLeft > yellowPercent) then return 1, 1, 1; @@ -429,7 +429,7 @@ end function MOD:ReLoad() -- DO STUFF self:UpdateDimensions() -end +end function MOD:Load() self.Docklet = SV.Dock:NewDocklet("BottomRight", "SVUI_QuestTracker", "Quest Tracker", MOD.media.dockIcon); @@ -467,12 +467,12 @@ function MOD:Load() scrollFrame:SetScript("OnMouseWheel", function(self, delta) local scroll = self:GetVerticalScroll(); local value = (scroll - (20 * delta)); - if value < -1 then + if value < -1 then value = 0 - end - if value > self.MaxVal then + end + if value > self.MaxVal then value = self.MaxVal - end + end self:SetVerticalScroll(value) self.ScrollBar:SetValue(value) end) @@ -502,4 +502,4 @@ function MOD:Load() self.Headers["Popups"]:Refresh() SV.Events:On("DOCK_RIGHT_EXPANDED", ExpandQuestTracker, true); -end \ No newline at end of file +end diff --git a/SVUI_QuestTracker/components/achievements.lua b/SVUI_QuestTracker/components/achievements.lua index e1a5637..eb92427 100644 --- a/SVUI_QuestTracker/components/achievements.lua +++ b/SVUI_QuestTracker/components/achievements.lua @@ -1,7 +1,7 @@ --[[ ########################################################## S V U I By: Munglunch -########################################################## +########################################################## LOCALIZED LUA FUNCTIONS ########################################################## ]]-- @@ -50,8 +50,8 @@ local GetAchievementCriteriaInfo = _G.GetAchievementCriteriaInfo; local CRITERIA_TYPE_ACHIEVEMENT = _G.CRITERIA_TYPE_ACHIEVEMENT; local TRACKER_HEADER_ACHIEVEMENTS = _G.TRACKER_HEADER_ACHIEVEMENTS; local EVALUATION_TREE_FLAG_PROGRESS_BAR = _G.EVALUATION_TREE_FLAG_PROGRESS_BAR; ---[[ -########################################################## +--[[ +########################################################## GET ADDON DATA ########################################################## ]]-- @@ -59,8 +59,8 @@ local SV = _G['SVUI'] local L = SV.L local LSM = _G.LibStub("LibSharedMedia-3.0") local MOD = SV.QuestTracker; ---[[ -########################################################## +--[[ +########################################################## LOCALS ########################################################## ]]-- @@ -76,8 +76,8 @@ local OBJ_ICON_COMPLETE = [[Interface\COMMON\Indicator-Green]]; local OBJ_ICON_INCOMPLETE = [[Interface\COMMON\Indicator-Gray]]; local LINE_ACHIEVEMENT_ICON = [[Interface\ICONS\Achievement_General]]; local MAX_OBJECTIVES_SHOWN = 8; ---[[ -########################################################## +--[[ +########################################################## SCRIPT HANDLERS ########################################################## ]]-- @@ -120,13 +120,13 @@ local ViewButton_OnClick = function(self, button) end end end ---[[ -########################################################## +--[[ +########################################################## TRACKER FUNCTIONS ########################################################## ]]-- local GetAchievementRow = function(self, index) - if(not self.Rows[index]) then + if(not self.Rows[index]) then local previousFrame = self.Rows[#self.Rows] local index = #self.Rows + 1; @@ -225,17 +225,17 @@ local SetAchievementRow = function(self, index, title, details, icon, achievemen _, description = GetAchievementInfo(assetID); end end - + if(description and description ~= '') then shown_objectives = shown_objectives + 1; - - fill_height = fill_height + (INNER_HEIGHT + 2); + + fill_height = fill_height + (ROW_HEIGHT + 2); objective_rows = objective_block:SetInfo(objective_rows, description, completed) if(duration and elapsed and elapsed < duration) then - fill_height = fill_height + (INNER_HEIGHT + 2); + fill_height = fill_height + (ROW_HEIGHT + 2); objective_rows = objective_block:SetTimer(objective_rows, duration, elapsed); end - end + end end end @@ -296,8 +296,8 @@ local ResetAchievementBlock = function(self) end end end ---[[ -########################################################## +--[[ +########################################################## CORE FUNCTIONS ########################################################## ]]-- @@ -352,4 +352,4 @@ function MOD:InitializeAchievements() self.Headers["Achievements"]:Refresh() SV.Events:On("QUEST_UPVALUES_UPDATED", UpdateAchievementLocals, true); -end \ No newline at end of file +end diff --git a/SVUI_QuestTracker/components/popups.lua b/SVUI_QuestTracker/components/popups.lua index 9ddc448..66e2a68 100644 --- a/SVUI_QuestTracker/components/popups.lua +++ b/SVUI_QuestTracker/components/popups.lua @@ -1,7 +1,7 @@ --[[ ########################################################## S V U I By: Munglunch -########################################################## +########################################################## LOCALIZED LUA FUNCTIONS ########################################################## ]]-- @@ -43,8 +43,8 @@ local RemoveAutoQuestPopUp = _G.RemoveAutoQuestPopUp; local AddAutoQuestPopUp = _G.AddAutoQuestPopUp; local GetAutoQuestPopUp = _G.GetAutoQuestPopUp; local GetNumAutoQuestPopUps = _G.GetNumAutoQuestPopUps; ---[[ -########################################################## +--[[ +########################################################## GET ADDON DATA ########################################################## ]]-- @@ -52,8 +52,8 @@ local SV = _G['SVUI'] local L = SV.L local LSM = _G.LibStub("LibSharedMedia-3.0") local MOD = SV.QuestTracker; ---[[ -########################################################## +--[[ +########################################################## LOCALS ########################################################## ]]-- @@ -65,8 +65,8 @@ local LARGE_INNER_HEIGHT = LARGE_ROW_HEIGHT - 4; local OBJ_ICON_ACTIVE = [[Interface\COMMON\Indicator-Yellow]]; local OBJ_ICON_COMPLETE = [[Interface\COMMON\Indicator-Green]]; local OBJ_ICON_INCOMPLETE = [[Interface\COMMON\Indicator-Gray]]; ---[[ -########################################################## +--[[ +########################################################## SCRIPT HANDLERS ########################################################## ]]-- @@ -82,13 +82,13 @@ local PopUpButton_OnClick = function(self, button) MOD.Headers["Popups"]:RemovePopup(questID) end end ---[[ -########################################################## +--[[ +########################################################## TRACKER FUNCTIONS ########################################################## ]]-- local GetPopUpRow = function(self, index) - if(not self.Rows[index]) then + if(not self.Rows[index]) then local previousFrame = self.Rows[#self.Rows] local index = #self.Rows + 1; local row = CreateFrame("Frame", nil, self) @@ -103,7 +103,7 @@ local GetPopUpRow = function(self, index) row.Button = CreateFrame("Button", nil, row) row.Button:SetPoint("TOPLEFT", row, "TOPLEFT", 0, 0); row.Button:SetPoint("BOTTOMRIGHT", row, "BOTTOMRIGHT", 0, 0); - row.Button:SetStyle("DockButton") + row.Button:SetStyle("LiteButton") row.Button:SetPanelColor("yellow") row.Button:SetID(0) row.Button.PopUpType = nil; @@ -111,14 +111,14 @@ local GetPopUpRow = function(self, index) row.Badge = CreateFrame("Frame", nil, row.Button) row.Badge:SetPoint("TOPLEFT", row.Button, "TOPLEFT", 4, -4); row.Badge:SetSize((LARGE_INNER_HEIGHT - 4), (LARGE_INNER_HEIGHT - 4)); - row.Badge:SetStyle("!_Frame", "Inset") + row.Badge:SetStyle("!_Frame", "Icon") row.Badge.Icon = row.Badge:CreateTexture(nil,"OVERLAY") row.Badge.Icon:InsetPoints(row.Badge); row.Badge.Icon:SetTexture(MOD.media.incompleteIcon) row.Badge.Icon:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) row.Header = CreateFrame("Frame", nil, row.Button) row.Header:SetPoint("TOPLEFT", row.Badge, "TOPRIGHT", 4, -1); - row.Header:SetPoint("BOTTOMRIGHT", row.Button, "BOTTOMRIGHT", -2, 2); + row.Header:SetPoint("BOTTOMRIGHT", row.Button, "BOTTOMRIGHT", -5, 5); row.Header:SetStyle("Frame") row.Header.Text = row.Header:CreateFontString(nil,"OVERLAY") row.Header.Text:SetFontObject(SVUI_Font_Quest); @@ -226,8 +226,8 @@ end local _hook_RemoveAutoPopUpQuests = function(questID) MOD.Headers["Popups"]:RemovePopup(questID, true) end ---[[ -########################################################## +--[[ +########################################################## CORE FUNCTIONS ########################################################## ]]-- @@ -264,4 +264,4 @@ function MOD:InitializePopups() hooksecurefunc("AutoQuestPopupTracker_RemovePopUp", _hook_RemoveAutoPopUpQuests); SV.Events:On("QUEST_UPVALUES_UPDATED", UpdatePopupLocals, true); -end \ No newline at end of file +end diff --git a/SVUI_QuestTracker/components/quests.lua b/SVUI_QuestTracker/components/quests.lua index 029db7d..46e6918 100644 --- a/SVUI_QuestTracker/components/quests.lua +++ b/SVUI_QuestTracker/components/quests.lua @@ -885,7 +885,7 @@ local SetQuestRow = function(self, index, watchIndex, title, level, icon, questI objective_block:Reset(); for i = 1, subCount do - local description, category, objective_completed = GetQuestObjectiveInfo(questID, i); + local description, category, objective_completed = GetQuestObjectiveInfo(questID, i, false); if not objective_completed then iscomplete = false end if(description) then fill_height = fill_height + (INNER_HEIGHT + 4); diff --git a/SVUI_Skins/SVUI_Skins.lua b/SVUI_Skins/SVUI_Skins.lua index 2b56215..01ea4c8 100644 --- a/SVUI_Skins/SVUI_Skins.lua +++ b/SVUI_Skins/SVUI_Skins.lua @@ -1,7 +1,7 @@ --[[ ########################################################## S V U I By: Munglunch -########################################################## +########################################################## LOCALIZED LUA FUNCTIONS ########################################################## ]]-- @@ -29,8 +29,8 @@ local LoadAddOn = _G.LoadAddOn; --BLIZZARD API local InCombatLockdown = _G.InCombatLockdown; local CreateFrame = _G.CreateFrame; ---[[ -########################################################## +--[[ +########################################################## GET ADDON DATA ########################################################## ]]-- @@ -41,8 +41,8 @@ if(not MOD) then return end; local NewHook = hooksecurefunc; local Schema = MOD.Schema; local VERSION = MOD.Version; ---[[ -########################################################## +--[[ +########################################################## CORE DATA ########################################################## ]]-- @@ -53,8 +53,8 @@ MOD.EventListeners = {}; MOD.OnLoadAddons = {}; MOD.SkinnedAddons = {}; MOD.Debugging = false; ---[[ -########################################################## +--[[ +########################################################## CORE FUNCTIONS ########################################################## ]]-- @@ -76,6 +76,7 @@ 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 @@ -103,11 +104,11 @@ function MOD:SaveAddonStyle(addon, fn, force, passive, ...) if(passive) then self:DefineEventFunction("ADDON_LOADED", addon) end - for i=1, select("#",...) do + for i=1, select("#",...) do local event = select(i,...) if(event) then self:DefineEventFunction(event, addon) - end + end end if(SV.defaults.Skins.addons and SV.defaults.Skins.addons[addon] == nil) then SV.defaults.Skins.addons[addon] = true @@ -118,10 +119,10 @@ function MOD:SaveAddonStyle(addon, fn, force, passive, ...) else self.AddOnQueue[addon] = fn end -end +end function MOD:SaveBlizzardStyle(addon, fn, force) - if force then + if force then if(not IsAddOnLoaded(addon)) then LoadAddOn(addon) end @@ -129,11 +130,11 @@ function MOD:SaveBlizzardStyle(addon, fn, force) else self.OnLoadAddons[addon] = fn end -end +end function MOD:SaveCustomStyle(fn) tinsert(MOD.CustomQueue, fn) -end +end function MOD:DefineEventFunction(addonEvent, addon) if(not addon) then return end @@ -143,41 +144,41 @@ function MOD:DefineEventFunction(addonEvent, addon) self.EventListeners[addonEvent][addon] = true if(not self[addonEvent]) then self[addonEvent] = function(self, event, ...) - for name,fn in pairs(self.AddOnQueue) do + for name,fn in pairs(self.AddOnQueue) do if self:IsAddonReady(name) and self.EventListeners[event] and self.EventListeners[event][name] then self:Style(name, fn, event, ...) - end - end - end + end + end + end self:RegisterEvent(addonEvent); end end function MOD:SafeEventRemoval(addon, event) - if not self.EventListeners[event] then return end - if not self.EventListeners[event][addon] then return end + if not self.EventListeners[event] then return end + if not self.EventListeners[event][addon] then return end self.EventListeners[event][addon] = nil; local defined = false; - for name,_ in pairs(self.EventListeners[event]) do + for name,_ in pairs(self.EventListeners[event]) do if name then defined = true; - break - end - end - if not defined then - self:UnregisterEvent(event) - end + break + end + end + if not defined then + self:UnregisterEvent(event) + end end function MOD:PLAYER_ENTERING_WORLD(event, ...) for addonName,fn in pairs(self.OnLoadAddons) do - if(IsAddOnLoaded(addonName)) then + if(IsAddOnLoaded(addonName)) then self:Style(addonName, fn, event, ...) self.OnLoadAddons[addonName] = nil - end + end end - for _,fn in pairs(self.CustomQueue)do + for _,fn in pairs(self.CustomQueue)do fn(event, ...) end @@ -190,7 +191,7 @@ function MOD:PLAYER_ENTERING_WORLD(event, ...) end if(listener[addonName] and self:IsAddonReady(addonName)) then self:Style(addonName, fn, event, ...) - end + end end SV.Events:Trigger("REQUEST_TEMPLATE_UPDATED"); @@ -209,11 +210,11 @@ function MOD:ADDON_LOADED(event, addon) local listener = self.EventListeners[event] if(listener) then - for name, fn in pairs(self.AddOnQueue) do + for name, fn in pairs(self.AddOnQueue) do if(listener[name] and self:IsAddonReady(name)) then self:Style(name, fn, event, addon) needsUpdate = true - end + end end end @@ -225,8 +226,8 @@ function MOD:ADDON_LOADED(event, addon) SV.Events:Trigger("REQUEST_TEMPLATE_UPDATED"); end end ---[[ -########################################################## +--[[ +########################################################## CUSTOM HANDLERS ########################################################## ]]-- @@ -293,8 +294,8 @@ local function DockFadeOutDocklet() MOD.Docklet.Dock2:Hide() end end ---[[ -########################################################## +--[[ +########################################################## BUILD FUNCTION ########################################################## ]]-- @@ -370,4 +371,4 @@ function MOD:Load() SV.Events:On("DOCK_RIGHT_FADE_IN", DockFadeInDocklet, true); SV.Events:On("DOCK_RIGHT_FADE_OUT", DockFadeOutDocklet, true); SV.Events:On("DOCK_RIGHT_EXPANDED", DockExpandDocklet, true); -end \ No newline at end of file +end diff --git a/SVUI_Skins/components/addons/ACP.lua b/SVUI_Skins/components/addons/ACP.lua index e9ebf45..4bc2d04 100644 --- a/SVUI_Skins/components/addons/ACP.lua +++ b/SVUI_Skins/components/addons/ACP.lua @@ -73,7 +73,7 @@ local function StyleACP() _G["ACP_AddonListEntry"..c.."Enabled"]:SetStyle("Checkbox") end ACP_AddonList_NoRecurse:SetStyle("Checkbox") - SV.API:Set("ScrollFrame", ACP_AddonList_ScrollFrameScrollBar) + SV.API:Set("ScrollBar", ACP_AddonList_ScrollFrameScrollBar) SV.API:Set("DropDown", ACP_AddonListSortDropDown) ACP_AddonListSortDropDown:SetWidth(130) ACP_AddonList_ScrollFrame:SetWidth(590) diff --git a/SVUI_Skins/components/addons/Ace3.lua b/SVUI_Skins/components/addons/Ace3.lua index 085e18a..3cafdb8 100644 --- a/SVUI_Skins/components/addons/Ace3.lua +++ b/SVUI_Skins/components/addons/Ace3.lua @@ -43,7 +43,7 @@ local function Widget_OnLeave(b) end local function Widget_ScrollStyle(frame, arg) - return SV.API:Set("ScrollFrame", frame) + return SV.API:Set("ScrollBar", frame) end local function Widget_ButtonStyle(frame, strip, bypass) @@ -111,7 +111,7 @@ local function StyleAceGUI(event, addon) SV.API:Set("!_Frame", widgetFrame, "Default", true) SV.API:Set("Frame", widget.scrollBG, "Lite", true) Widget_ButtonStyle(widget.button) - SV.API:Set("ScrollFrame", widget.scrollBar) + SV.API:Set("ScrollBar", widget.scrollBar) widget.scrollBar:SetPoint("RIGHT", widgetFrame, "RIGHT", -4) widget.scrollBG:SetPoint("TOPRIGHT", widget.scrollBar, "TOPLEFT", -2, 19) widget.scrollBG:SetPoint("BOTTOMLEFT", widget.button, "TOPLEFT") @@ -208,7 +208,7 @@ local function StyleAceGUI(event, addon) -- print("RegisterAsContainer: " .. widgetType); local widgetParent = widget.content:GetParent() if widgetType == "ScrollFrame" then - SV.API:Set("ScrollFrame", widget.scrollBar) + SV.API:Set("ScrollBar", widget.scrollBar) elseif widgetType == "Frame" then for i = 1, widgetParent:GetNumChildren()do local childFrame = select(i, widgetParent:GetChildren()) @@ -251,7 +251,7 @@ local function StyleAceGUI(event, addon) end if widget.scrollbar then - SV.API:Set("ScrollFrame", widget.scrollBar) + SV.API:Set("ScrollBar", widget.scrollBar) end end return regContainer(self, widget) diff --git a/SVUI_Skins/components/addons/AtlasLoot.lua b/SVUI_Skins/components/addons/AtlasLoot.lua index 3232c3b..39bb46a 100644 --- a/SVUI_Skins/components/addons/AtlasLoot.lua +++ b/SVUI_Skins/components/addons/AtlasLoot.lua @@ -199,8 +199,8 @@ local function StyleAtlasLoot(event, addon) AtlasLootPanel.Titel:SetTextColor(23/255, 132/255, 209/255) AtlasLootPanel.Titel:SetPoint("BOTTOM", AtlasLootPanel.TitelBg, "BOTTOM", 0, 40) - SV.API:Set("ScrollFrame", AtlasLootCompareFrame_ScrollFrameItemFrameScrollBar) - SV.API:Set("ScrollFrame", AtlasLootCompareFrame_WishlistScrollFrameScrollBar) + SV.API:Set("ScrollBar", AtlasLootCompareFrame_ScrollFrameItemFrameScrollBar) + SV.API:Set("ScrollBar", AtlasLootCompareFrame_WishlistScrollFrameScrollBar) AtlasLootDefaultFrame:HookScript("OnShow", AL_OnShow) AtlasLootCompareFrame:HookScript("OnShow", Compare_OnShow) AtlasLootPanel.timeLapse = 0; diff --git a/SVUI_Skins/components/addons/LightHeaded.lua b/SVUI_Skins/components/addons/LightHeaded.lua index 1bc4683..1bb266e 100644 --- a/SVUI_Skins/components/addons/LightHeaded.lua +++ b/SVUI_Skins/components/addons/LightHeaded.lua @@ -67,7 +67,7 @@ local function StyleLightHeaded() lhsub.next:SetHeight(16) lhsub.prev:SetPoint("RIGHT", lhsub.page, "LEFT", -25, 0) lhsub.next:SetPoint("LEFT", lhsub.page, "RIGHT", 25, 0) - SV.API:Set("ScrollFrame", LightHeadedScrollFrameScrollBar, 5) + SV.API:Set("ScrollBar", LightHeadedScrollFrameScrollBar, 5) lhsub.title:SetTextColor(23/255, 132/255, 209/255) lhframe.timeLapse = 0; diff --git a/SVUI_Skins/components/addons/Mogit.lua b/SVUI_Skins/components/addons/Mogit.lua index 2b96a70..4fdb42d 100644 --- a/SVUI_Skins/components/addons/Mogit.lua +++ b/SVUI_Skins/components/addons/Mogit.lua @@ -72,7 +72,7 @@ local function StyleMogIt() SV.API:Set("CloseButton", MogItFiltersCloseButton) MogItFrameFiltersDefaults:RemoveTextures(true) MogItFrameFiltersDefaults:SetStyle("Button") - SV.API:Set("ScrollFrame", MogItScroll) - SV.API:Set("ScrollFrame", MogItFiltersScrollScrollBar) + SV.API:Set("ScrollBar", MogItScroll) + SV.API:Set("ScrollBar", MogItFiltersScrollScrollBar) end MOD:SaveAddonStyle("MogIt", StyleMogIt) \ No newline at end of file diff --git a/SVUI_Skins/components/addons/Outfitter.lua b/SVUI_Skins/components/addons/Outfitter.lua index e7853d0..dd883a6 100644 --- a/SVUI_Skins/components/addons/Outfitter.lua +++ b/SVUI_Skins/components/addons/Outfitter.lua @@ -56,7 +56,7 @@ local function StyleOutfitter() OutfitterFrameTab1:SetStyle("Button") OutfitterFrameTab2:SetStyle("Button") OutfitterFrameTab3:SetStyle("Button") - SV.API:Set("ScrollFrame", OutfitterMainFrameScrollFrameScrollBar) + SV.API:Set("ScrollBar", OutfitterMainFrameScrollFrameScrollBar) SV.API:Set("CloseButton", OutfitterCloseButton) OutfitterNewButton:SetStyle("Button") OutfitterEnableNone:SetStyle("Button") @@ -98,7 +98,7 @@ local function StyleOutfitter() OutfitterShowOutfitBar:SetPoint("TOPLEFT", OutfitterAutoSwitch, "BOTTOMLEFT", 0, -5) OutfitterEditScriptDialogDoneButton:SetStyle("Button") OutfitterEditScriptDialogCancelButton:SetStyle("Button") - SV.API:Set("ScrollFrame", OutfitterEditScriptDialogSourceScriptScrollBar) + SV.API:Set("ScrollBar", OutfitterEditScriptDialogSourceScriptScrollBar) SV.API:Set("Frame", OutfitterEditScriptDialogSourceScript,"Transparent") SV.API:Set("Frame", OutfitterEditScriptDialog) SV.API:Set("CloseButton", OutfitterEditScriptDialog.CloseButton) diff --git a/SVUI_Skins/components/addons/Recount.lua b/SVUI_Skins/components/addons/Recount.lua index 9576d2d..ade67bf 100644 --- a/SVUI_Skins/components/addons/Recount.lua +++ b/SVUI_Skins/components/addons/Recount.lua @@ -95,7 +95,7 @@ local function StyleRecount() for _, frame in pairs(RecountFrames) do StyleFrame(frame) end - SV.API:Set("ScrollFrame", Recount_MainWindow_ScrollBarScrollBar) + SV.API:Set("ScrollBar", Recount_MainWindow_ScrollBarScrollBar) Recount.MainWindow:HookScript('OnShow', function(self) if InCombatLockdown() then return end if MOD.Docklet:IsEmbedded("Recount") then MOD.Docklet:Show() end end) Recount.MainWindow.FileButton:HookScript('OnClick', function(self) if LibDropdownFrame0 then SV.API:Set("Frame", LibDropdownFrame0) end end) diff --git a/SVUI_Skins/components/addons/SVUI_!Options.lua b/SVUI_Skins/components/addons/SVUI_!Options.lua index 4ac81fd..5e77bec 100644 --- a/SVUI_Skins/components/addons/SVUI_!Options.lua +++ b/SVUI_Skins/components/addons/SVUI_!Options.lua @@ -43,7 +43,7 @@ local function Widget_OnLeave(b) end local function Widget_ScrollStyle(frame, arg) - return SV.API:Set("ScrollFrame", frame) + return SV.API:Set("ScrollBar", frame) end local function Widget_ButtonStyle(frame, strip, bypass) @@ -111,7 +111,7 @@ function MOD:StyleSVUIOptions() SV.API:Set("!_Frame", widgetFrame, "Default", true) SV.API:Set("Frame", widget.scrollBG, "Lite", true) Widget_ButtonStyle(widget.button) - SV.API:Set("ScrollFrame", widget.scrollBar) + SV.API:Set("ScrollBar", widget.scrollBar) widget.scrollBar:SetPoint("RIGHT", widgetFrame, "RIGHT", -4) widget.scrollBG:SetPoint("TOPRIGHT", widget.scrollBar, "TOPLEFT", -2, 19) widget.scrollBG:SetPoint("BOTTOMLEFT", widget.button, "TOPLEFT") @@ -208,7 +208,7 @@ function MOD:StyleSVUIOptions() -- print("RegisterAsContainer: " .. widgetType); local widgetParent = widget.content:GetParent() if widgetType == "ScrollFrame" then - SV.API:Set("ScrollFrame", widget.scrollBar) + SV.API:Set("ScrollBar", widget.scrollBar) elseif widgetType == "Frame" then for i = 1, widgetParent:GetNumChildren()do local childFrame = select(i, widgetParent:GetChildren()) @@ -251,7 +251,7 @@ function MOD:StyleSVUIOptions() end if widget.scrollbar then - SV.API:Set("ScrollFrame", widget.scrollBar) + SV.API:Set("ScrollBar", widget.scrollBar) end end return regContainer(self, widget) diff --git a/SVUI_Skins/components/addons/TradeSkillDW.lua b/SVUI_Skins/components/addons/TradeSkillDW.lua index 9e28997..1ae45b0 100644 --- a/SVUI_Skins/components/addons/TradeSkillDW.lua +++ b/SVUI_Skins/components/addons/TradeSkillDW.lua @@ -70,7 +70,7 @@ local function StyleTradeSkillDW() TradeSkillInputBox:SetStyle("Editbox") TradeSkillIncrementButton:SetPoint("RIGHT", TradeSkillCreateButton, "LEFT", -13, 0) SV.API:Set("CloseButton", TradeSkillFrameCloseButton) - SV.API:Set("ScrollFrame", TradeSkillDetailScrollFrameScrollBar) + SV.API:Set("ScrollBar", TradeSkillDetailScrollFrameScrollBar) local once = false @@ -129,7 +129,7 @@ local function StyleTradeSkillDW() TradeSkillDW_QueueFrameDetailScrollFrameChildFrameReagent6:RemoveTextures() TradeSkillDW_QueueFrameDetailScrollFrameChildFrameReagent7:RemoveTextures() TradeSkillDW_QueueFrameDetailScrollFrameChildFrameReagent8:RemoveTextures() - SV.API:Set("ScrollFrame", TradeSkillDW_QueueFrameDetailScrollFrameScrollBar) + SV.API:Set("ScrollBar", TradeSkillDW_QueueFrameDetailScrollFrameScrollBar) TradeSkillListScrollFrame:RemoveTextures() end --[[#################################################]]-- diff --git a/SVUI_Skins/components/addons/VEM.lua b/SVUI_Skins/components/addons/VEM.lua index b4d4165..92bf44b 100644 --- a/SVUI_Skins/components/addons/VEM.lua +++ b/SVUI_Skins/components/addons/VEM.lua @@ -232,7 +232,7 @@ local function StyleVEM(event, addon) SV.API:Set("Tab", VEM_GUI_OptionsFrameTab2) VEM_GUI_OptionsFrameOkay:SetStyle("Button") VEM_GUI_OptionsFrameWebsiteButton:SetStyle("Button") - SV.API:Set("ScrollFrame", VEM_GUI_OptionsFramePanelContainerFOVScrollBar) + SV.API:Set("ScrollBar", VEM_GUI_OptionsFramePanelContainerFOVScrollBar) MOD:SafeEventRemoval("VEM", event) end end diff --git a/SVUI_Skins/components/blizzard/achievement.lua b/SVUI_Skins/components/blizzard/achievement.lua index 542c1f1..813fb71 100644 --- a/SVUI_Skins/components/blizzard/achievement.lua +++ b/SVUI_Skins/components/blizzard/achievement.lua @@ -179,11 +179,11 @@ local function AchievementStyle() SV.API:Set("DropDown", AchievementFrameFilterDropDown) AchievementFrameFilterDropDown:SetPoint("TOPRIGHT", AchievementFrame, "TOPRIGHT", -44, 5) - SV.API:Set("ScrollFrame", AchievementFrameCategoriesContainerScrollBar, 5) - SV.API:Set("ScrollFrame", AchievementFrameAchievementsContainerScrollBar, 5) - SV.API:Set("ScrollFrame", AchievementFrameStatsContainerScrollBar, 5) - SV.API:Set("ScrollFrame", AchievementFrameComparisonContainerScrollBar, 5) - SV.API:Set("ScrollFrame", AchievementFrameComparisonStatsContainerScrollBar, 5) + SV.API:Set("ScrollBar", AchievementFrameCategoriesContainerScrollBar, 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) for i = 1, 3 do local tab = _G["AchievementFrameTab"..i] diff --git a/SVUI_Skins/components/blizzard/auctionhouse.lua b/SVUI_Skins/components/blizzard/auctionhouse.lua index 82f736b..71fe793 100644 --- a/SVUI_Skins/components/blizzard/auctionhouse.lua +++ b/SVUI_Skins/components/blizzard/auctionhouse.lua @@ -99,13 +99,13 @@ local function AuctionStyle() BidScrollFrame:RemoveTextures() SV.API:Set("CloseButton", AuctionFrameCloseButton) - SV.API:Set("ScrollFrame", AuctionsScrollFrameScrollBar) + SV.API:Set("ScrollBar", AuctionsScrollFrameScrollBar) SV.API:Set("DropDown", BrowseDropDown) SV.API:Set("DropDown", PriceDropDown) SV.API:Set("DropDown", DurationDropDown) - SV.API:Set("ScrollFrame", BrowseFilterScrollFrameScrollBar) - SV.API:Set("ScrollFrame", BrowseScrollFrameScrollBar) + SV.API:Set("ScrollBar", BrowseFilterScrollFrameScrollBar) + SV.API:Set("ScrollBar", BrowseScrollFrameScrollBar) IsUsableCheckButton:SetStyle("Checkbox") ShowOnPlayerCheckButton:SetStyle("Checkbox") diff --git a/SVUI_Skins/components/blizzard/blackmarket.lua b/SVUI_Skins/components/blizzard/blackmarket.lua index 76cc544..ba5f151 100644 --- a/SVUI_Skins/components/blizzard/blackmarket.lua +++ b/SVUI_Skins/components/blizzard/blackmarket.lua @@ -60,7 +60,7 @@ local function BlackMarketStyle() BlackMarketFrame.Inset:SetStyle("!_Frame", "Inset") SV.API:Set("CloseButton", BlackMarketFrame.CloseButton) - SV.API:Set("ScrollFrame", BlackMarketScrollFrameScrollBar, 4) + SV.API:Set("ScrollBar", BlackMarketScrollFrameScrollBar, 4) ChangeTab(BlackMarketFrame.ColumnName) ChangeTab(BlackMarketFrame.ColumnLevel) diff --git a/SVUI_Skins/components/blizzard/calendar.lua b/SVUI_Skins/components/blizzard/calendar.lua index eee21bd..1bb5793 100644 --- a/SVUI_Skins/components/blizzard/calendar.lua +++ b/SVUI_Skins/components/blizzard/calendar.lua @@ -131,7 +131,7 @@ local function CalendarStyle() CalendarTexturePickerFrame:RemoveTextures() CalendarTexturePickerTitleFrame:RemoveTextures() CalendarTexturePickerFrame:SetStyle("!_Frame", "Transparent", true) - SV.API:Set("ScrollFrame", CalendarTexturePickerScrollBar) + SV.API:Set("ScrollBar", CalendarTexturePickerScrollBar) CalendarTexturePickerAcceptButton:SetStyle("Button") CalendarTexturePickerCancelButton:SetStyle("Button") CalendarCreateEventInviteButton:SetStyle("Button") @@ -164,18 +164,18 @@ local function CalendarStyle() CalendarViewEventInviteList:SetStyle("!_Frame", "Transparent", true) CalendarViewEventInviteListSection:RemoveTextures() SV.API:Set("CloseButton", CalendarViewEventCloseButton) - SV.API:Set("ScrollFrame", CalendarViewEventInviteListScrollFrameScrollBar) + SV.API:Set("ScrollBar", CalendarViewEventInviteListScrollFrameScrollBar) for _,btn in pairs(CalendarButtons)do _G[btn]:SetStyle("Button") end CalendarEventPickerFrame:RemoveTextures() CalendarEventPickerTitleFrame:RemoveTextures() CalendarEventPickerFrame:SetStyle("!_Frame", "Transparent", true) - SV.API:Set("ScrollFrame", CalendarEventPickerScrollBar) + SV.API:Set("ScrollBar", CalendarEventPickerScrollBar) CalendarEventPickerCloseButton:SetStyle("Button") - SV.API:Set("ScrollFrame", CalendarCreateEventDescriptionScrollFrameScrollBar) - SV.API:Set("ScrollFrame", CalendarCreateEventInviteListScrollFrameScrollBar) - SV.API:Set("ScrollFrame", CalendarViewEventDescriptionScrollFrameScrollBar) + SV.API:Set("ScrollBar", CalendarCreateEventDescriptionScrollFrameScrollBar) + SV.API:Set("ScrollBar", CalendarCreateEventInviteListScrollFrameScrollBar) + SV.API:Set("ScrollBar", CalendarViewEventDescriptionScrollFrameScrollBar) end --[[ ########################################################## diff --git a/SVUI_Skins/components/blizzard/character.lua b/SVUI_Skins/components/blizzard/character.lua index e7b3075..0b3bcec 100644 --- a/SVUI_Skins/components/blizzard/character.lua +++ b/SVUI_Skins/components/blizzard/character.lua @@ -256,10 +256,10 @@ local function CharacterFrameStyle() SV.API:Set("Window", CharacterFrame, true, true, 1, 3, 3) SV.API:Set("CloseButton", CharacterFrameCloseButton) - SV.API:Set("ScrollFrame", CharacterStatsPaneScrollBar) - SV.API:Set("ScrollFrame", ReputationListScrollFrameScrollBar) - SV.API:Set("ScrollFrame", TokenFrameContainerScrollBar) - SV.API:Set("ScrollFrame", GearManagerDialogPopupScrollFrameScrollBar) + SV.API:Set("ScrollBar", CharacterStatsPaneScrollBar) + SV.API:Set("ScrollBar", ReputationListScrollFrameScrollBar) + SV.API:Set("ScrollBar", TokenFrameContainerScrollBar) + SV.API:Set("ScrollBar", GearManagerDialogPopupScrollFrameScrollBar) StyleCharacterSlots() @@ -297,8 +297,8 @@ local function CharacterFrameStyle() EquipmentFlyoutFrame:HookScript("OnShow", EquipmentFlyout_OnShow) hooksecurefunc("EquipmentFlyout_Show", EquipmentFlyout_OnShow) CharacterFramePortrait:Die() - SV.API:Set("ScrollFrame", _G["PaperDollTitlesPaneScrollBar"], 5) - SV.API:Set("ScrollFrame", _G["PaperDollEquipmentManagerPaneScrollBar"], 5) + SV.API:Set("ScrollBar", _G["PaperDollTitlesPaneScrollBar"], 5) + SV.API:Set("ScrollBar", _G["PaperDollEquipmentManagerPaneScrollBar"], 5) for _,gName in pairs(CharFrameList) do if(_G[gName]) then _G[gName]:RemoveTextures(true) end diff --git a/SVUI_Skins/components/blizzard/encounterjournal.lua b/SVUI_Skins/components/blizzard/encounterjournal.lua index bf186e4..9d7ad68 100644 --- a/SVUI_Skins/components/blizzard/encounterjournal.lua +++ b/SVUI_Skins/components/blizzard/encounterjournal.lua @@ -14,8 +14,8 @@ local SV = _G['SVUI']; local L = SV.L; local MOD = SV.Skins; local Schema = MOD.Schema; ---[[ -########################################################## +--[[ +########################################################## ENCOUNTERJOURNAL MODR ########################################################## ]]-- @@ -104,25 +104,87 @@ local function _hook_EncounterJournal_SetBullets(object, ...) end end +local function _hook_EncounterJournal_ListInstances() + local frame = EncounterJournal.instanceSelect.scroll.child + local index = 1 + local instanceButton = frame["instance"..index]; + while instanceButton do + Outline(instanceButton) + index = index + 1; + instanceButton = frame["instance"..index] + end +end + +local function _hook_EncounterJournal_ToggleHeaders(self) + local isOverview = self.isOverview; + + if (not isOverview) then + local usedHeaders = EncounterJournal.encounter.usedHeaders + for key,used in pairs(usedHeaders) do + if(not used.button.Panel) then + used:RemoveTextures(true) + used.button:RemoveTextures(true) + used.button:SetStyle("Button") + end + used.description:SetTextColor(1, 1, 1) + --used.button.portrait.icon:Hide() + end + else + local overviews = EncounterJournal.encounter.overviewFrame.overviews + for i = 1, #overviews do + local overview = overviews[i]; + if(overview) then + if(not overview.Panel) then + overview:RemoveTextures(true) + overview.button:RemoveTextures(true) + overview:SetStyle("Button") + end + if(overview.loreDescription) then + overview.loreDescription:SetTextColor(1, 1, 1) + end + if(overview.description) then + overview.description:SetTextColor(1, 1, 1) + end + end + end + end +end + +local function _hook_EncounterJournal_LootUpdate() + local scrollFrame = EncounterJournal.encounter.info.lootScroll; + local offset = HybridScrollFrame_GetOffset(scrollFrame); + local items = scrollFrame.buttons; + local item, index; + + local numLoot = EJ_GetNumLoot() + + for i = 1,#items do + item = items[i]; + index = offset + i; + if index <= numLoot then + item.icon:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) + SV.API:Set("ItemButton", item) + item.slot:SetTextColor(0.5, 1, 0) + item.armorType:SetTextColor(1, 1, 0) + item.boss:SetTextColor(0.7, 0.08, 0) + end + end +end + local function EncounterJournalStyle() if SV.db.Skins.blizzard.enable ~= true or SV.db.Skins.blizzard.encounterjournal ~= true then - return - end + return + end EncounterJournal:RemoveTextures(true) EncounterJournalInstanceSelect:RemoveTextures(true) - EncounterJournalNavBar:RemoveTextures(true) - EncounterJournalNavBarOverlay:RemoveTextures(true) - EncounterJournalNavBarHomeButton:RemoveTextures(true) EncounterJournalInset:RemoveTextures(true) EncounterJournalEncounterFrame:RemoveTextures(true) EncounterJournalEncounterFrameInfo:RemoveTextures(true) EncounterJournalEncounterFrameInfoDifficulty:RemoveTextures(true) EncounterJournalEncounterFrameInfoLootScrollFrameFilterToggle:RemoveTextures(true) - EncounterJournalEncounterFrameInfoBossesScrollFrame:RemoveTextures(true) - EncounterJournalInstanceSelectDungeonTab:RemoveTextures(true) - EncounterJournalInstanceSelectRaidTab:RemoveTextures(true) + ChangeTabHelper(EncounterJournalEncounterFrameInfoOverviewTab, 10) ChangeTabHelper(EncounterJournalEncounterFrameInfoLootTab, 0, -10) ChangeTabHelper(EncounterJournalEncounterFrameInfoBossTab, 0, -10) @@ -136,29 +198,55 @@ local function EncounterJournalStyle() EncounterJournalSearchResults:RemoveTextures(true) SV.API:Set("EditBox", EncounterJournalSearchBox) - EncounterJournal:SetStyle("Frame", "Window2") - EncounterJournal:SetPanelColor("dark") - EncounterJournalInset:SetStyle("!_Frame", "Inset") - - EncounterJournalInstanceSelectScrollFrameScrollChild:SetStyle("!_Frame", "Default") - EncounterJournalInstanceSelectScrollFrameScrollChild:SetPanelColor("dark") - EncounterJournalInstanceSelectScrollDownButton:SetStyle("Button") - EncounterJournalInstanceSelectScrollDownButton:SetNormalTexture(SV.media.icon.move_down) + EncounterJournal:SetStyle("Frame", "Window") + EncounterJournalInset:SetStyle("!_Frame", "Window2") + EncounterJournalInset:SetPanelColor("darkest") - EncounterJournalEncounterFrameInstanceFrame:SetStyle("!_Frame", "Inset") + SV.API:Set("ScrollBar", EncounterJournalInstanceSelectScrollFrame) + SV.API:Set("ScrollBar", EncounterJournalEncounterFrameInfoBossesScrollFrame) + SV.API:Set("ScrollBar", EncounterJournalEncounterFrameInfoOverviewScrollFrame) + SV.API:Set("ScrollBar", EncounterJournalEncounterFrameInfoLootScrollFrame) + SV.API:Set("ScrollBar", EncounterJournalEncounterFrameInfoDetailsScrollFrame) + SV.API:Set("DropDown", EncounterJournalInstanceSelectTierDropDown) + SV.API:Set("CloseButton", EncounterJournalCloseButton) - SV.API:Set("SkinPremium", EncounterJournalEncounterFrameInfoBossesScrollFrame, -20, 40, 0, 0) + EncounterJournalEncounterFrameInfoResetButton:SetStyle("Button") + EncounterJournalNavBar:RemoveTextures(true) + EncounterJournalNavBarOverlay:RemoveTextures(true) + EncounterJournalNavBarOverflowButton:RemoveTextures(true) + EncounterJournalNavBarHomeButton:RemoveTextures(true) EncounterJournalNavBarHomeButton:SetStyle("Button") + EncounterJournalNavBarOverflowButton:SetStyle("Button") EncounterJournalEncounterFrameInfoDifficulty:SetStyle("Button") EncounterJournalEncounterFrameInfoDifficulty:SetFrameLevel(EncounterJournalEncounterFrameInfoDifficulty:GetFrameLevel() + 10) EncounterJournalEncounterFrameInfoLootScrollFrameFilterToggle:SetStyle("Button") EncounterJournalEncounterFrameInfoLootScrollFrameFilterToggle:SetFrameLevel(EncounterJournalEncounterFrameInfoLootScrollFrameFilterToggle:GetFrameLevel() + 10) - EncounterJournalInstanceSelectDungeonTab:SetStyle("Button") - EncounterJournalInstanceSelectRaidTab:SetStyle("Button") + if(EncounterJournalSuggestFrame) then + if(EncounterJournalSuggestFrame.Suggestion1 and EncounterJournalSuggestFrame.Suggestion1.button) then + EncounterJournalSuggestFrame.Suggestion1.button:RemoveTextures(true) + EncounterJournalSuggestFrame.Suggestion1.button:SetStyle("Button") + end + if(EncounterJournalSuggestFrame.Suggestion2 and EncounterJournalSuggestFrame.Suggestion2.centerDisplay and EncounterJournalSuggestFrame.Suggestion2.centerDisplay.button) then + EncounterJournalSuggestFrame.Suggestion2.centerDisplay.button:RemoveTextures(true) + EncounterJournalSuggestFrame.Suggestion2.centerDisplay.button:SetStyle("Button") + end + end - SV.API:Set("ScrollBar", EncounterJournalEncounterFrameInfoLootScrollBar) + local tabBaseName = "EncounterJournalInstanceSelect"; + if(_G[tabBaseName .. "SuggestTab"]) then + _G[tabBaseName .. "SuggestTab"]:RemoveTextures(true) + _G[tabBaseName .. "SuggestTab"]:SetStyle("Button") + end + if(_G[tabBaseName .. "DungeonTab"]) then + _G[tabBaseName .. "DungeonTab"]:RemoveTextures(true) + _G[tabBaseName .. "DungeonTab"]:SetStyle("Button") + end + if(_G[tabBaseName .. "RaidTab"]) then + _G[tabBaseName .. "RaidTab"]:RemoveTextures(true) + _G[tabBaseName .. "RaidTab"]:SetStyle("Button") + end local bgParent = EncounterJournal.encounter.instance local loreParent = EncounterJournal.encounter.instance.loreScroll @@ -190,77 +278,18 @@ local function EncounterJournalStyle() end end - hooksecurefunc("EncounterJournal_SetBullets", _hook_EncounterJournal_SetBullets) + EncounterJournal.instanceSelect.raidsTab:GetFontString():SetTextColor(1, 1, 1); - hooksecurefunc("EncounterJournal_ListInstances", function() - local frame = EncounterJournal.instanceSelect.scroll.child - local index = 1 - local instanceButton = frame["instance"..index]; - while instanceButton do - Outline(instanceButton) - index = index + 1; - instanceButton = frame["instance"..index] - end - end) + hooksecurefunc("EncounterJournal_SetBullets", _hook_EncounterJournal_SetBullets) + hooksecurefunc("EncounterJournal_ListInstances", _hook_EncounterJournal_ListInstances) + hooksecurefunc("EncounterJournal_ToggleHeaders", _hook_EncounterJournal_ToggleHeaders) + hooksecurefunc("EncounterJournal_LootUpdate", _hook_EncounterJournal_LootUpdate) - EncounterJournal.instanceSelect.raidsTab:GetFontString():SetTextColor(1, 1, 1); - hooksecurefunc("EncounterJournal_ToggleHeaders", function(self, isOverview) - if (not isOverview) then - local usedHeaders = EncounterJournal.encounter.usedHeaders - for key,used in pairs(usedHeaders) do - if(not used.button.Panel) then - used:RemoveTextures(true) - used.button:RemoveTextures(true) - used.button:SetStyle("Button") - end - used.description:SetTextColor(1, 1, 1) - --used.button.portrait.icon:Hide() - end - else - local overviews = EncounterJournal.encounter.overviewFrame.overviews - for i = 1, #overviews do - local overview = overviews[i]; - if(overview) then - if(not overview.Panel) then - overview:RemoveTextures(true) - overview.button:RemoveTextures(true) - overview:SetStyle("Button") - end - if(overview.loreDescription) then - overview.loreDescription:SetTextColor(1, 1, 1) - end - if(overview.description) then - overview.description:SetTextColor(1, 1, 1) - end - end - end - end - end) - - hooksecurefunc("EncounterJournal_LootUpdate", function() - local scrollFrame = EncounterJournal.encounter.info.lootScroll; - local offset = HybridScrollFrame_GetOffset(scrollFrame); - local items = scrollFrame.buttons; - local item, index; - - local numLoot = EJ_GetNumLoot() - - for i = 1,#items do - item = items[i]; - index = offset + i; - if index <= numLoot then - item.icon:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) - SV.API:Set("ItemButton", item) - item.slot:SetTextColor(0.5, 1, 0) - item.armorType:SetTextColor(1, 1, 0) - item.boss:SetTextColor(0.7, 0.08, 0) - end - end - end) -end ---[[ -########################################################## + _hook_EncounterJournal_ToggleHeaders() +end +--[[ +########################################################## MOD LOADING ########################################################## ]]-- -MOD:SaveBlizzardStyle('Blizzard_EncounterJournal', EncounterJournalStyle) \ No newline at end of file +MOD:SaveBlizzardStyle('Blizzard_EncounterJournal', EncounterJournalStyle) diff --git a/SVUI_Skins/components/blizzard/friends.lua b/SVUI_Skins/components/blizzard/friends.lua index 3a8dc85..1555b83 100644 --- a/SVUI_Skins/components/blizzard/friends.lua +++ b/SVUI_Skins/components/blizzard/friends.lua @@ -163,9 +163,9 @@ local function FriendsFrameStyle() FriendsFrameFriendsScrollFrame:DisableDrawLayer("BACKGROUND") - SV.API:Set("ScrollFrame", FriendsFrameFriendsScrollFrameScrollBar, 5) - SV.API:Set("ScrollFrame", WhoListScrollFrameScrollBar, 5) - SV.API:Set("ScrollFrame", ChannelRosterScrollFrameScrollBar, 5) + SV.API:Set("ScrollBar", FriendsFrameFriendsScrollFrameScrollBar, 5) + SV.API:Set("ScrollBar", WhoListScrollFrameScrollBar, 5) + SV.API:Set("ScrollBar", ChannelRosterScrollFrameScrollBar, 5) FriendsFrameStatusDropDown:SetPoint('TOPLEFT', FriendsTabHeader, 'TOPLEFT', 0, -27) SV.API:Set("DropDown", FriendsFrameStatusDropDown, 70) @@ -193,7 +193,7 @@ local function FriendsFrameStyle() AddFriendFrame:SetStyle("!_Frame", "Transparent", true) ScrollOfResurrectionSelectionFrame:SetStyle("!_Frame", 'Transparent') ScrollOfResurrectionSelectionFrameList:SetStyle("!_Frame", 'Default') - SV.API:Set("ScrollFrame", ScrollOfResurrectionSelectionFrameListScrollFrameScrollBar, 4) + SV.API:Set("ScrollBar", ScrollOfResurrectionSelectionFrameListScrollFrameScrollBar, 4) ScrollOfResurrectionSelectionFrameTargetEditBox:SetStyle("Editbox") FriendsFrameBroadcastInput:SetStyle("Frame", "Default") ChannelFrameDaughterFrameChannelName:SetStyle("Frame", "Default") @@ -263,9 +263,9 @@ local function FriendsFrameStyle() FriendsTabHeaderRecruitAFriendButtonIcon:InsetPoints() FriendsFrameIgnoreScrollFrame:SetStyle("!_Frame", "Model") - SV.API:Set("ScrollFrame", FriendsFrameIgnoreScrollFrameScrollBar, 4) + SV.API:Set("ScrollBar", FriendsFrameIgnoreScrollFrameScrollBar, 4) FriendsFramePendingScrollFrame:SetStyle("!_Frame", "Inset") - SV.API:Set("ScrollFrame", FriendsFramePendingScrollFrameScrollBar, 4) + SV.API:Set("ScrollBar", FriendsFramePendingScrollFrameScrollBar, 4) IgnoreListFrame:RemoveTextures() PendingListFrame:RemoveTextures() ScrollOfResurrectionFrame:RemoveTextures() diff --git a/SVUI_Skins/components/blizzard/garrison.lua b/SVUI_Skins/components/blizzard/garrison.lua index 5544cf7..2a1e537 100644 --- a/SVUI_Skins/components/blizzard/garrison.lua +++ b/SVUI_Skins/components/blizzard/garrison.lua @@ -406,7 +406,7 @@ local function LoadGarrisonStyle() GarrisonMissionFrame.MissionCompleteBackground:DisableDrawLayer("BACKGROUND") GarrisonMissionFrameMissionsListScrollFrame:RemoveTextures() - SV.API:Set("ScrollFrame", GarrisonMissionFrameMissionsListScrollFrame) + SV.API:Set("ScrollBar", GarrisonMissionFrameMissionsListScrollFrame) SV.API:Set("Tab", GarrisonMissionFrameMissionsTab1, nil, 10, 4) SV.API:Set("Tab", GarrisonMissionFrameMissionsTab2, nil, 10, 4) @@ -530,9 +530,9 @@ local function LoadGarrisonStyle() SV.API:Set("PageButton", GarrisonCapacitiveDisplayFrame.IncrementButton) end - SV.API:Set("ScrollFrame", GarrisonLandingPageReportListListScrollFrameScrollBar) - SV.API:Set("ScrollFrame", GarrisonMissionFrameMissionsListScrollFrameScrollBar) - SV.API:Set("ScrollFrame", GarrisonMissionFrameFollowersListScrollFrameScrollBar) + SV.API:Set("ScrollBar", GarrisonLandingPageReportListListScrollFrameScrollBar) + SV.API:Set("ScrollBar", GarrisonMissionFrameMissionsListScrollFrameScrollBar) + SV.API:Set("ScrollBar", GarrisonMissionFrameFollowersListScrollFrameScrollBar) SV.API:Set("CloseButton", GarrisonLandingPage.CloseButton) SV.API:Set("CloseButton", GarrisonMissionFrame.MissionTab.MissionPage.CloseButton) GarrisonLandingPage.CloseButton:SetFrameStrata("HIGH") @@ -546,7 +546,7 @@ local function LoadGarrisonStyle() end end - SV.API:Set("ScrollFrame", GarrisonLandingPageListScrollFrameScrollBar) + SV.API:Set("ScrollBar", GarrisonLandingPageListScrollFrameScrollBar) SV.API:Set("Window", GarrisonRecruiterFrame, true) GarrisonRecruiterFrameInset:RemoveTextures() diff --git a/SVUI_Skins/components/blizzard/guild.lua b/SVUI_Skins/components/blizzard/guild.lua index 83cdee2..a5fee9c 100644 --- a/SVUI_Skins/components/blizzard/guild.lua +++ b/SVUI_Skins/components/blizzard/guild.lua @@ -341,7 +341,7 @@ local function GuildBankStyle() GuildBankEmblemFrame:RemoveTextures(true) GuildBankMoneyFrameBackground:Die() - SV.API:Set("ScrollFrame", GuildBankPopupScrollFrameScrollBar) + SV.API:Set("ScrollBar", GuildBankPopupScrollFrameScrollBar) for i = 1, GuildBankFrame:GetNumChildren() do local child = select(i, GuildBankFrame:GetChildren()) @@ -459,8 +459,8 @@ local function GuildBankStyle() end end - SV.API:Set("ScrollFrame", GuildBankTransactionsScrollFrameScrollBar) - SV.API:Set("ScrollFrame", GuildBankInfoScrollFrameScrollBar) + SV.API:Set("ScrollBar", GuildBankTransactionsScrollFrameScrollBar) + SV.API:Set("ScrollBar", GuildBankInfoScrollFrameScrollBar) end local function GuildFrameStyle() @@ -521,7 +521,7 @@ local function GuildFrameStyle() GuildFactionBar.Panel:SetPoint("BOTTOMRIGHT", GuildFactionBar, "BOTTOMRIGHT", 1, 1) GuildRosterContainer:SetStyle("Frame", "Inset") - SV.API:Set("ScrollFrame", GuildRosterContainerScrollBar, 4, -4) + SV.API:Set("ScrollBar", GuildRosterContainerScrollBar, 4, -4) GuildRosterShowOfflineButton:SetStyle("Checkbox") for i = 1, 4 do @@ -572,8 +572,8 @@ local function GuildFrameStyle() end GuildNewsFiltersFrame:SetPoint("TOPLEFT", GuildFrame, "TOPRIGHT", 4, -20) - SV.API:Set("ScrollFrame", GuildNewsContainerScrollBar, 4, 4) - SV.API:Set("ScrollFrame", GuildInfoDetailsFrameScrollBar, 4, 4) + SV.API:Set("ScrollBar", GuildNewsContainerScrollBar, 4, 4) + SV.API:Set("ScrollBar", GuildInfoDetailsFrameScrollBar, 4, 4) for i = 1, 3 do local tab = _G["GuildInfoFrameTab"..i] @@ -599,7 +599,7 @@ local function GuildFrameStyle() GuildRecruitmentCommentInputFrame:SetStyle("!_Frame", "Default") GuildTextEditFrame:SetStyle("!_Frame", "Transparent", true) - SV.API:Set("ScrollFrame", GuildTextEditScrollFrameScrollBar, 4, 4) + SV.API:Set("ScrollBar", GuildTextEditScrollFrameScrollBar, 4, 4) GuildTextEditContainer:SetStyle("!_Frame", "Default") local editChildren = GuildTextEditFrame:GetNumChildren() @@ -615,7 +615,7 @@ local function GuildFrameStyle() end end - SV.API:Set("ScrollFrame", GuildLogScrollFrameScrollBar, 4, 4) + SV.API:Set("ScrollBar", GuildLogScrollFrameScrollBar, 4, 4) GuildLogFrame:SetStyle("Frame", 'Transparent') local logChildren = GuildLogFrame:GetNumChildren() @@ -632,8 +632,8 @@ local function GuildFrameStyle() end GuildRewardsFrame:SetStyle("Frame", "Inset") - SV.API:Set("ScrollFrame", GuildRewardsContainerScrollBar, 4, -4) - SV.API:Set("ScrollFrame", GuildPerksContainerScrollBar, 4, 2) + SV.API:Set("ScrollBar", GuildRewardsContainerScrollBar, 4, -4) + SV.API:Set("ScrollBar", GuildPerksContainerScrollBar, 4, 2) for i = 1, 8 do local button = _G["GuildPerksContainerButton"..i] @@ -682,7 +682,7 @@ local function GuildControlStyle() SV.API:Set("Window", GuildControlUI) - SV.API:Set("ScrollFrame", GuildControlUIRankBankFrameInsetScrollFrameScrollBar) + SV.API:Set("ScrollBar", GuildControlUIRankBankFrameInsetScrollFrameScrollBar) hooksecurefunc("GuildControlUI_RankOrder_Update", _hook_RankOrder_OnUpdate) GuildControlUIRankOrderFrameNewButton:HookScript("OnClick", _hook_UIRankOrder) @@ -728,7 +728,7 @@ local function LFGuildFrameStyle() LookingForGuildBrowseButton_LeftSeparator:Die() LookingForGuildRequestButton_RightSeparator:Die() - SV.API:Set("ScrollFrame", LookingForGuildBrowseFrameContainerScrollBar) + SV.API:Set("ScrollBar", LookingForGuildBrowseFrameContainerScrollBar) LookingForGuildBrowseButton:SetStyle("Button") LookingForGuildRequestButton:SetStyle("Button") diff --git a/SVUI_Skins/components/blizzard/help.lua b/SVUI_Skins/components/blizzard/help.lua index e91d9a1..afad562 100644 --- a/SVUI_Skins/components/blizzard/help.lua +++ b/SVUI_Skins/components/blizzard/help.lua @@ -82,7 +82,7 @@ local function HelpFrameStyle() e:RemoveTextures() end end - SV.API:Set("ScrollFrame", HelpFrameReportBugScrollFrameScrollBar) + SV.API:Set("ScrollBar", HelpFrameReportBugScrollFrameScrollBar) HelpFrameSubmitSuggestionScrollFrame:RemoveTextures() HelpFrameSubmitSuggestionScrollFrame:SetStyle("Frame", "Default") HelpFrameSubmitSuggestionScrollFrame.Panel:SetPoint("TOPLEFT", -4, 4) @@ -93,7 +93,7 @@ local function HelpFrameStyle() e:RemoveTextures() end end - SV.API:Set("ScrollFrame", HelpFrameSubmitSuggestionScrollFrameScrollBar) + SV.API:Set("ScrollBar", HelpFrameSubmitSuggestionScrollFrameScrollBar) HelpFrameTicketScrollFrame:RemoveTextures() HelpFrameTicketScrollFrame:SetStyle("Frame", "Default") HelpFrameTicketScrollFrame.Panel:SetPoint("TOPLEFT", -4, 4) @@ -104,7 +104,7 @@ local function HelpFrameStyle() e:RemoveTextures() end end - SV.API:Set("ScrollFrame", HelpFrameKnowledgebaseScrollFrame2ScrollBar) + SV.API:Set("ScrollBar", HelpFrameKnowledgebaseScrollFrame2ScrollBar) for d = 1, #HelpFrameButtonList do _G[HelpFrameButtonList[d]]:RemoveTextures(true) _G[HelpFrameButtonList[d]]:SetStyle("Button") @@ -133,8 +133,8 @@ local function HelpFrameStyle() HelpFrame:RemoveTextures(true) HelpFrame:SetStyle("Frame", "Window") HelpFrameKnowledgebaseSearchBox:SetStyle("Editbox") - SV.API:Set("ScrollFrame", HelpFrameKnowledgebaseScrollFrameScrollBar, 5) - SV.API:Set("ScrollFrame", HelpFrameTicketScrollFrameScrollBar, 4) + SV.API:Set("ScrollBar", HelpFrameKnowledgebaseScrollFrameScrollBar, 5) + SV.API:Set("ScrollBar", HelpFrameTicketScrollFrameScrollBar, 4) SV.API:Set("CloseButton", HelpFrameCloseButton, HelpFrame.Panel) SV.API:Set("CloseButton", HelpFrameKnowledgebaseErrorFrameCloseButton, HelpFrameKnowledgebaseErrorFrame.Panel) HelpFrameCharacterStuckHearthstone:SetStyle("Button") diff --git a/SVUI_Skins/components/blizzard/itemsocketing.lua b/SVUI_Skins/components/blizzard/itemsocketing.lua index 9fcf3cd..fe45827 100644 --- a/SVUI_Skins/components/blizzard/itemsocketing.lua +++ b/SVUI_Skins/components/blizzard/itemsocketing.lua @@ -24,7 +24,7 @@ local function ItemSocketStyle() ItemSocketingFrameInset:Die() ItemSocketingScrollFrame:RemoveTextures() ItemSocketingScrollFrame:SetStyle("Frame", "Inset", true) - SV.API:Set("ScrollFrame", ItemSocketingScrollFrameScrollBar, 2) + SV.API:Set("ScrollBar", ItemSocketingScrollFrameScrollBar, 2) for j = 1, MAX_NUM_SOCKETS do local i = _G[("ItemSocketingSocket%d"):format(j)]; local C = _G[("ItemSocketingSocket%dBracketFrame"):format(j)]; diff --git a/SVUI_Skins/components/blizzard/keybinding.lua b/SVUI_Skins/components/blizzard/keybinding.lua index ec5be4b..3cbbfa0 100644 --- a/SVUI_Skins/components/blizzard/keybinding.lua +++ b/SVUI_Skins/components/blizzard/keybinding.lua @@ -51,7 +51,7 @@ local function BindingStyle() end end - SV.API:Set("ScrollFrame", KeyBindingFrameScrollFrameScrollBar) + SV.API:Set("ScrollBar", KeyBindingFrameScrollFrameScrollBar) KeyBindingFrame:RemoveTextures() KeyBindingFrame:SetStyle("Frame", "Window") end diff --git a/SVUI_Skins/components/blizzard/lfd.lua b/SVUI_Skins/components/blizzard/lfd.lua index 245affb..4325882 100644 --- a/SVUI_Skins/components/blizzard/lfd.lua +++ b/SVUI_Skins/components/blizzard/lfd.lua @@ -158,7 +158,7 @@ local function LFDFrameStyle() LFDQueueFrameRandomScrollFrameChildFrameBonusRepFrame.ChooseButton:SetStyle("Button") ScenarioQueueFrameRandomScrollFrameChildFrameBonusRepFrame.ChooseButton:SetStyle("Button") - SV.API:Set("ScrollFrame", ScenarioQueueFrameRandomScrollFrameScrollBar) + SV.API:Set("ScrollBar", ScenarioQueueFrameRandomScrollFrameScrollBar) GroupFinderFrameGroupButton1.icon:SetTexture("Interface\\Icons\\INV_Helmet_08") GroupFinderFrameGroupButton2.icon:SetTexture("Interface\\Icons\\Icon_Scenarios") @@ -358,12 +358,12 @@ local function LFDFrameStyle() SV.API:Set("CloseButton", RaidBrowserFrameCloseButton) LFRQueueFrameFindGroupButton:SetStyle("Button") LFRQueueFrameAcceptCommentButton:SetStyle("Button") - SV.API:Set("ScrollFrame", LFRQueueFrameCommentScrollFrameScrollBar) - SV.API:Set("ScrollFrame", LFDQueueFrameSpecificListScrollFrameScrollBar) + SV.API:Set("ScrollBar", LFRQueueFrameCommentScrollFrameScrollBar) + SV.API:Set("ScrollBar", LFDQueueFrameSpecificListScrollFrameScrollBar) RaidBrowserFrame:HookScript('OnShow', function() if not LFRQueueFrameSpecificListScrollFrameScrollBar.styled then - SV.API:Set("ScrollFrame", LFRQueueFrameSpecificListScrollFrameScrollBar) + SV.API:Set("ScrollBar", LFRQueueFrameSpecificListScrollFrameScrollBar) LFRBrowseFrame:RemoveTextures() for u = 1, 2 do local C = _G['LFRParentFrameSideTab'..u] @@ -404,8 +404,8 @@ local function LFDFrameStyle() _G[ScenarioQueueFrame.PartyBackfill:GetName().."BackfillButton"]:SetStyle("Button") _G[ScenarioQueueFrame.PartyBackfill:GetName().."NoBackfillButton"]:SetStyle("Button") - SV.API:Set("ScrollFrame", LFDQueueFrameRandomScrollFrameScrollBar) - SV.API:Set("ScrollFrame", ScenarioQueueFrameSpecificScrollFrameScrollBar) + SV.API:Set("ScrollBar", LFDQueueFrameRandomScrollFrameScrollBar) + SV.API:Set("ScrollBar", ScenarioQueueFrameSpecificScrollFrameScrollBar) LFDQueueFrameRandomScrollFrame:SetStyle("Frame", 'Transparent') ScenarioQueueFrameRandomScrollFrame:SetStyle("Frame", 'Transparent') RaidFinderQueueFrameScrollFrame:SetStyle("Frame", 'Transparent') diff --git a/SVUI_Skins/components/blizzard/macro.lua b/SVUI_Skins/components/blizzard/macro.lua index 3f9eacd..5857212 100644 --- a/SVUI_Skins/components/blizzard/macro.lua +++ b/SVUI_Skins/components/blizzard/macro.lua @@ -34,9 +34,9 @@ local function MacroUIStyle() SV.API:Set("Window", MacroFrame, true) SV.API:Set("CloseButton", MacroFrameCloseButton) - SV.API:Set("ScrollFrame", MacroButtonScrollFrameScrollBar) - SV.API:Set("ScrollFrame", MacroFrameScrollFrameScrollBar) - SV.API:Set("ScrollFrame", MacroPopupScrollFrameScrollBar) + SV.API:Set("ScrollBar", MacroButtonScrollFrameScrollBar) + SV.API:Set("ScrollBar", MacroFrameScrollFrameScrollBar) + SV.API:Set("ScrollBar", MacroPopupScrollFrameScrollBar) MacroFrame:SetWidth(360) @@ -94,7 +94,7 @@ local function MacroUIStyle() MacroFrameInset:Die() MacroButtonContainer:RemoveTextures() - SV.API:Set("ScrollFrame", MacroButtonScrollFrame) + SV.API:Set("ScrollBar", MacroButtonScrollFrame) MacroButtonScrollFrame:SetStyle("!_Frame", "Inset") MacroPopupFrame:HookScript("OnShow", function(c) diff --git a/SVUI_Skins/components/blizzard/misc.lua b/SVUI_Skins/components/blizzard/misc.lua index 6125e81..10cfdef 100644 --- a/SVUI_Skins/components/blizzard/misc.lua +++ b/SVUI_Skins/components/blizzard/misc.lua @@ -16,6 +16,19 @@ local Schema = MOD.Schema; ########################################################## ########################################################## ]]-- +local _hook_NavBar_AddButton = function(self, buttonData) + local navButton = self.navList[#self.navList]; + if(not navButton or navButton.Panel) then return end + navButton:RemoveTextures() + navButton:SetStyle("Button") + if(navButton.MenuArrowButton) then + navButton.MenuArrowButton:SetNormalTexture('') + navButton.MenuArrowButton:SetPushedTexture('') + end +end + +hooksecurefunc("NavBar_AddButton", _hook_NavBar_AddButton) + local MissingLootFrame_OnShow = function(self) local numMissing = GetNumMissingLootItems() for i = 1, numMissing do @@ -211,10 +224,10 @@ local function MiscStyles() end) ItemTextFrame:SetStyle("Frame", "Pattern") ItemTextFrameInset:Die() - SV.API:Set("ScrollFrame", ItemTextScrollFrameScrollBar) + SV.API:Set("ScrollBar", ItemTextScrollFrameScrollBar) SV.API:Set("CloseButton", ItemTextFrameCloseButton) local r = {"GossipFrameGreetingPanel", "GossipFrameInset", "GossipGreetingScrollFrame"} - SV.API:Set("ScrollFrame", GossipGreetingScrollFrameScrollBar, 5) + SV.API:Set("ScrollBar", GossipGreetingScrollFrameScrollBar, 5) for s, t in pairs(r)do _G[t]:RemoveTextures() end @@ -314,7 +327,7 @@ local function MiscStyles() txt:SetText("RESIZE") LootHistoryFrameScrollFrame:RemoveTextures() - SV.API:Set("ScrollFrame", LootHistoryFrameScrollFrameScrollBar) + SV.API:Set("ScrollBar", LootHistoryFrameScrollFrameScrollBar) hooksecurefunc("LootHistoryFrame_FullUpdate", LootHistoryFrame_OnUpdate) MasterLooterFrame:RemoveTextures() @@ -360,7 +373,7 @@ local function MiscStyles() SendMailScrollFrame:RemoveTextures(true) SendMailScrollFrame:SetStyle("!_Frame", "Inset") - SV.API:Set("ScrollFrame", SendMailScrollFrameScrollBar) + SV.API:Set("ScrollBar", SendMailScrollFrameScrollBar) SendMailNameEditBox:SetStyle("Editbox") SendMailNameEditBox.Panel:SetPoint("BOTTOMRIGHT", 2, 4) @@ -401,7 +414,7 @@ local function MiscStyles() OpenMailScrollFrame:RemoveTextures(true) OpenMailScrollFrame:SetStyle("!_Frame", "Default") - SV.API:Set("ScrollFrame", OpenMailScrollFrameScrollBar) + SV.API:Set("ScrollBar", OpenMailScrollFrameScrollBar) SendMailBodyEditBox:SetTextColor(1, 1, 1) OpenMailBodyText:SetTextColor(1, 1, 1) InvoiceTextFontNormal:SetTextColor(1, 1, 1) @@ -713,7 +726,7 @@ local function MiscStyles() WorldStateScoreFrame:RemoveTextures() WorldStateScoreFrame:SetStyle("Frame", "Window") SV.API:Set("CloseButton", WorldStateScoreFrameCloseButton) - SV.API:Set("ScrollFrame", WorldStateScoreScrollFrameScrollBar) + SV.API:Set("ScrollBar", WorldStateScoreScrollFrameScrollBar) WorldStateScoreFrameInset:SetAlpha(0) WorldStateScoreFrameLeaveButton:SetStyle("Button") SV.API:Set("Tab", _G["WorldStateScoreFrameTab1"]) diff --git a/SVUI_Skins/components/blizzard/petjournal.lua b/SVUI_Skins/components/blizzard/petjournal.lua index 53f2ce0..366b24f 100644 --- a/SVUI_Skins/components/blizzard/petjournal.lua +++ b/SVUI_Skins/components/blizzard/petjournal.lua @@ -105,7 +105,7 @@ local function CollectionsJournalStyle() MountJournalMountButton:SetStyle("Button") MountJournalSearchBox:SetStyle("Editbox") - SV.API:Set("ScrollFrame", MountJournalListScrollFrameScrollBar) + SV.API:Set("ScrollBar", MountJournalListScrollFrameScrollBar) MountJournal.MountDisplay:SetStyle("!_Frame", "Model") local buttons = MountJournal.ListScrollFrame.buttons @@ -146,7 +146,7 @@ local function CollectionsJournalStyle() PetJournalFilterButton:RemoveTextures(true) PetJournalFilterButton:SetStyle("Button") PetJournalListScrollFrame:RemoveTextures() - SV.API:Set("ScrollFrame", PetJournalListScrollFrameScrollBar) + SV.API:Set("ScrollBar", PetJournalListScrollFrameScrollBar) for i = 1, #PetJournal.listScroll.buttons do local button = _G["PetJournalListScrollFrameButton" .. i] diff --git a/SVUI_Skins/components/blizzard/pvp.lua b/SVUI_Skins/components/blizzard/pvp.lua index 8394126..75cb873 100644 --- a/SVUI_Skins/components/blizzard/pvp.lua +++ b/SVUI_Skins/components/blizzard/pvp.lua @@ -65,7 +65,7 @@ local function PVPFrameStyle() SV.API:Set("DropDown", HonorFrameTypeDropDown) HonorFrame.Inset:RemoveTextures() HonorFrame.Inset:SetStyle("!_Frame", "Inset") - SV.API:Set("ScrollFrame", HonorFrameSpecificFrameScrollBar) + SV.API:Set("ScrollBar", HonorFrameSpecificFrameScrollBar) HonorFrameSoloQueueButton:RemoveTextures() HonorFrameGroupQueueButton:RemoveTextures() HonorFrameSoloQueueButton:SetStyle("Button") @@ -122,8 +122,8 @@ local function PVPFrameStyle() WarGamesFrameInfoScrollFrameScrollBar:RemoveTextures() WarGameStartButton:RemoveTextures() WarGameStartButton:SetStyle("Button") - SV.API:Set("ScrollFrame", WarGamesFrameScrollFrameScrollBar) - SV.API:Set("ScrollFrame", WarGamesFrameInfoScrollFrameScrollBar) + SV.API:Set("ScrollBar", WarGamesFrameScrollFrameScrollBar) + SV.API:Set("ScrollBar", WarGamesFrameInfoScrollFrameScrollBar) WarGamesFrame.HorizontalBar:RemoveTextures() PVPReadyDialog:RemoveTextures() diff --git a/SVUI_Skins/components/blizzard/quest.lua b/SVUI_Skins/components/blizzard/quest.lua index 1e3a6a6..d1d49fa 100644 --- a/SVUI_Skins/components/blizzard/quest.lua +++ b/SVUI_Skins/components/blizzard/quest.lua @@ -148,11 +148,11 @@ local function QuestFrameStyle() QuestLogPopupDetailFrame:HookScript("OnShow", _hook_QuestLogPopupDetailFrameShow) SV.API:Set("CloseButton", QuestLogPopupDetailFrameCloseButton) - SV.API:Set("ScrollFrame", QuestLogPopupDetailFrameScrollFrameScrollBar, 5) - SV.API:Set("ScrollFrame", QuestRewardScrollFrameScrollBar) + SV.API:Set("ScrollBar", QuestLogPopupDetailFrameScrollFrameScrollBar, 5) + SV.API:Set("ScrollBar", QuestRewardScrollFrameScrollBar) QuestGreetingScrollFrame:RemoveTextures() - SV.API:Set("ScrollFrame", QuestGreetingScrollFrameScrollBar) + SV.API:Set("ScrollBar", QuestGreetingScrollFrameScrollBar) for i = 1, 10 do local name = ("QuestInfoRewardsFrameQuestInfoItem%d"):format(i) diff --git a/SVUI_Skins/components/blizzard/raid.lua b/SVUI_Skins/components/blizzard/raid.lua index 08b41b7..52e2417 100644 --- a/SVUI_Skins/components/blizzard/raid.lua +++ b/SVUI_Skins/components/blizzard/raid.lua @@ -85,7 +85,7 @@ local function RaidInfoStyle() RaidInfoFrame.Panel:SetPoint("BOTTOMRIGHT", RaidInfoFrame, "BOTTOMRIGHT") SV.API:Set("CloseButton", RaidInfoCloseButton, RaidInfoFrame) - SV.API:Set("ScrollFrame", RaidInfoScrollFrameScrollBar) + SV.API:Set("ScrollBar", RaidInfoScrollFrameScrollBar) if RaidFrameRaidBrowserButton then RaidFrameRaidBrowserButton:SetStyle("Button") end RaidFrameAllAssistCheckButton:SetStyle("Checkbox") diff --git a/SVUI_Skins/components/blizzard/talents.lua b/SVUI_Skins/components/blizzard/talents.lua index dfcfda2..6baa5f1 100644 --- a/SVUI_Skins/components/blizzard/talents.lua +++ b/SVUI_Skins/components/blizzard/talents.lua @@ -363,7 +363,7 @@ local function GlyphStyle() end SV.API:Set("DropDown", GlyphFrameFilterDropDown, 212) - SV.API:Set("ScrollFrame", GlyphFrameScrollFrameScrollBar, 5) + SV.API:Set("ScrollBar", GlyphFrameScrollFrameScrollBar, 5) for i = 1, 10 do local button = _G["GlyphFrameScrollFrameButton"..i] diff --git a/SVUI_Skins/components/blizzard/tradeskill.lua b/SVUI_Skins/components/blizzard/tradeskill.lua index 3cbfd49..9773752 100644 --- a/SVUI_Skins/components/blizzard/tradeskill.lua +++ b/SVUI_Skins/components/blizzard/tradeskill.lua @@ -66,8 +66,8 @@ local function TradeSkillStyle() TradeSkillCreateAllButton:SetStyle("Button") TradeSkillViewGuildCraftersButton:SetStyle("Button") - SV.API:Set("ScrollFrame", TradeSkillListScrollFrameScrollBar) - SV.API:Set("ScrollFrame", TradeSkillDetailScrollFrameScrollBar) + SV.API:Set("ScrollBar", TradeSkillListScrollFrameScrollBar) + SV.API:Set("ScrollBar", TradeSkillDetailScrollFrameScrollBar) TradeSkillLinkButton:SetSize(17, 14) TradeSkillLinkButton:SetPoint("LEFT", TradeSkillLinkFrame, "LEFT", 5, -1) diff --git a/SVUI_Skins/components/blizzard/trainer.lua b/SVUI_Skins/components/blizzard/trainer.lua index f2c4b63..eebd687 100644 --- a/SVUI_Skins/components/blizzard/trainer.lua +++ b/SVUI_Skins/components/blizzard/trainer.lua @@ -56,7 +56,7 @@ local function TrainerStyle() _G["ClassTrainerScrollFrameButton"..i].selectedTex:InsetPoints() end - SV.API:Set("ScrollFrame", ClassTrainerScrollFrameScrollBar, 5) + SV.API:Set("ScrollBar", ClassTrainerScrollFrameScrollBar, 5) for _,frame in pairs(ClassTrainerFrameList)do _G[frame]:RemoveTextures() diff --git a/SVUI_Skins/components/blizzard/worldmap.lua b/SVUI_Skins/components/blizzard/worldmap.lua index f2dbb65..b5fd8a6 100644 --- a/SVUI_Skins/components/blizzard/worldmap.lua +++ b/SVUI_Skins/components/blizzard/worldmap.lua @@ -12,8 +12,8 @@ local SV = _G['SVUI']; local L = SV.L; local MOD = SV.Skins; local Schema = MOD.Schema; ---[[ -########################################################## +--[[ +########################################################## HELPERS ########################################################## ]]-- @@ -37,7 +37,7 @@ local function WorldMap_SmallView() if(SVUI_WorldMapCoords) then SVUI_WorldMapCoords:SetPoint("BOTTOMLEFT", WorldMapFrame, "BOTTOMLEFT", 5, 5) end -end +end local function WorldMap_FullView() local WorldMapFrame = _G.WorldMapFrame; @@ -51,7 +51,7 @@ local function WorldMap_FullView() if(SVUI_WorldMapCoords) then SVUI_WorldMapCoords:SetPoint("BOTTOMLEFT", WorldMapFrame.Panel, "BOTTOMLEFT", 5, 5) end -end +end local function StripQuestMapFrame() local WorldMapFrame = _G.WorldMapFrame; @@ -67,7 +67,7 @@ local function StripQuestMapFrame() QuestMapFrame.DetailsFrame:RemoveTextures(true) QuestScrollFrame:RemoveTextures(true) QuestScrollFrame.ViewAll:RemoveTextures(true) - + QuestMapFrame.DetailsFrame.CompleteQuestFrame:RemoveTextures(true) QuestMapFrame.DetailsFrame.CompleteQuestFrame.CompleteButton:RemoveTextures(true) QuestMapFrame.DetailsFrame.BackButton:RemoveTextures(true) @@ -83,7 +83,7 @@ local function StripQuestMapFrame() QuestMapFrame.DetailsFrame.ShareButton:SetStyle("Button") QuestMapFrame.DetailsFrame.TrackButton:SetStyle("Button") - SV.API:Set("ScrollFrame", QuestMapDetailsScrollFrameScrollBar) + SV.API:Set("ScrollBar", QuestMapDetailsScrollFrameScrollBar) SV.API:Set("Skin", QuestMapFrame.DetailsFrame.RewardsFrame, 0, -10, 0, 0) QuestScrollFrame:SetStyle("!_Frame", "Paper") @@ -104,10 +104,10 @@ end local function WorldMap_OnShow() local WorldMapFrame = _G.WorldMapFrame; - + if WORLDMAP_SETTINGS.size == WORLDMAP_FULLMAP_SIZE then WorldMap_FullView() - elseif WORLDMAP_SETTINGS.size == WORLDMAP_WINDOWED_SIZE then + elseif WORLDMAP_SETTINGS.size == WORLDMAP_WINDOWED_SIZE then WorldMap_SmallView() end -- WorldMap_SmallView() @@ -122,11 +122,11 @@ local function WorldMap_OnShow() WorldMapFrameAreaDescription:SetShadowOffset(2, -2) WorldMapZoneInfo:SetShadowOffset(2, -2) - if InCombatLockdown() then return end + if InCombatLockdown() then return end AdjustMapLevel() -end ---[[ -########################################################## +end +--[[ +########################################################## WORLDMAP MODR ########################################################## ]]-- @@ -136,13 +136,13 @@ local function WorldMapStyle() SV.API:Set("Window", WorldMapFrame, true, true) --WorldMapFrame.Panel:SetStyle("Frame", "Transparent") - SV.API:Set("ScrollFrame", QuestScrollFrameScrollBar) - SV.API:Set("ScrollFrame", WorldMapQuestScrollFrameScrollBar) - SV.API:Set("ScrollFrame", WorldMapQuestDetailScrollFrameScrollBar, 4) - SV.API:Set("ScrollFrame", WorldMapQuestRewardScrollFrameScrollBar, 4) + SV.API:Set("ScrollBar", QuestScrollFrameScrollBar) + SV.API:Set("ScrollBar", WorldMapQuestScrollFrameScrollBar) + SV.API:Set("ScrollBar", WorldMapQuestDetailScrollFrameScrollBar, 4) + SV.API:Set("ScrollBar", WorldMapQuestRewardScrollFrameScrollBar, 4) WorldMapDetailFrame:SetStyle("Frame", "Blackout") - + WorldMapFrameSizeDownButton:SetFrameLevel(999) WorldMapFrameSizeUpButton:SetFrameLevel(999) WorldMapFrameCloseButton:SetFrameLevel(999) @@ -168,15 +168,17 @@ local function WorldMapStyle() WorldMapFrameNavBar:ClearAllPoints() WorldMapFrameNavBar:SetPoint("TOPLEFT", WorldMapFrame.Panel, "TOPLEFT", 12, -26) WorldMapFrameNavBar:SetStyle("Frame", "Inset", true, 2, 2, 1) + WorldMapFrameNavBarHomeButton:RemoveTextures(true) + WorldMapFrameNavBarHomeButton:SetStyle("Button") WorldMapFrameTutorialButton:Die() --SV.API:Set("InfoButton", WorldMapFrameTutorialButton) --WorldMapFrameTutorialButton:SetPoint("LEFT", WorldMapFrameNavBar.Panel, "RIGHT", -50, 0) WorldMap_OnShow() -end ---[[ -########################################################## +end +--[[ +########################################################## MOD LOADING ########################################################## ]]-- @@ -191,4 +193,4 @@ function ArchaeologyDigSiteFrame_OnUpdate() WorldMapArchaeologyDigSites:DrawBlob(blobID, true); end end -]] \ No newline at end of file +]] diff --git a/SVUI_Tooltip/SVUI_Tooltip.lua b/SVUI_Tooltip/SVUI_Tooltip.lua index 987db73..128579a 100644 --- a/SVUI_Tooltip/SVUI_Tooltip.lua +++ b/SVUI_Tooltip/SVUI_Tooltip.lua @@ -99,10 +99,14 @@ local tooltips = { BattlePetTooltip, FloatingBattlePetTooltip, FloatingPetBattleAbilityTooltip, FloatingGarrisonFollowerTooltip, GarrisonMissionMechanicTooltip, GarrisonFollowerTooltip, GarrisonMissionMechanicFollowerCounterTooltip, GarrisonFollowerAbilityTooltip, - SmallTextTooltip, BrowserSettingsTooltip, QueueStatusFrame, FrameStackTooltip, EventTraceTooltip, + SmallTextTooltip, BrowserSettingsTooltip, QueueStatusFrame, EventTraceTooltip, ItemSocketingDescription }; +-- local ignored_tooltips = { +-- FrameStackTooltip +-- }; + local classification = { worldboss = format("|cffAF5050%s|r", BOSS), rareelite = format("|cffAF5050+%s|r", ITEM_QUALITY3_DESC),