diff --git a/Interface/AddOns/SVUI/assets/artwork/Minimap/DEFAULT-OBJECTICONS.blp b/Interface/AddOns/SVUI/assets/artwork/Minimap/DEFAULT-OBJECTICONS.blp new file mode 100644 index 0000000..0e6b143 Binary files /dev/null and b/Interface/AddOns/SVUI/assets/artwork/Minimap/DEFAULT-OBJECTICONS.blp differ diff --git a/Interface/AddOns/SVUI/assets/artwork/Minimap/MINIMAP-OBJECTICONS.blp b/Interface/AddOns/SVUI/assets/artwork/Minimap/MINIMAP-OBJECTICONS.blp new file mode 100644 index 0000000..23595fd Binary files /dev/null and b/Interface/AddOns/SVUI/assets/artwork/Minimap/MINIMAP-OBJECTICONS.blp differ diff --git a/Interface/AddOns/SVUI/assets/artwork/Minimap/MINIMAP_ICONS.blp b/Interface/AddOns/SVUI/assets/artwork/Minimap/MINIMAP_ICONS.blp deleted file mode 100644 index d955e87..0000000 Binary files a/Interface/AddOns/SVUI/assets/artwork/Minimap/MINIMAP_ICONS.blp and /dev/null differ diff --git a/Interface/AddOns/SVUI/assets/artwork/Minimap/Thumbs.db b/Interface/AddOns/SVUI/assets/artwork/Minimap/Thumbs.db new file mode 100644 index 0000000..b5ecd0a Binary files /dev/null and b/Interface/AddOns/SVUI/assets/artwork/Minimap/Thumbs.db differ diff --git a/Interface/AddOns/SVUI/framework/framework.lua b/Interface/AddOns/SVUI/framework/framework.lua index 54c5088..17cd638 100644 --- a/Interface/AddOns/SVUI/framework/framework.lua +++ b/Interface/AddOns/SVUI/framework/framework.lua @@ -31,6 +31,7 @@ function SV:LoadFramework() self.Dropdown:Initialize(); self.Dock:Initialize(); self.Mentalo:Initialize(); + self.Graph:Initialize(); self.Comix:Initialize(); self.GameMenu:Initialize(); self.AFK:Initialize(); diff --git a/Interface/AddOns/SVUI/framework/movers/mover_graph.lua b/Interface/AddOns/SVUI/framework/movers/mover_graph.lua new file mode 100644 index 0000000..0feab5c --- /dev/null +++ b/Interface/AddOns/SVUI/framework/movers/mover_graph.lua @@ -0,0 +1,115 @@ +--[[ +############################################################################## +_____/\\\\\\\\\\\____/\\\________/\\\__/\\\________/\\\__/\\\\\\\\\\\_ # + ___/\\\/////////\\\_\/\\\_______\/\\\_\/\\\_______\/\\\_\/////\\\///__ # + __\//\\\______\///__\//\\\______/\\\__\/\\\_______\/\\\_____\/\\\_____ # + ___\////\\\__________\//\\\____/\\\___\/\\\_______\/\\\_____\/\\\_____ # + ______\////\\\________\//\\\__/\\\____\/\\\_______\/\\\_____\/\\\_____ # + _________\////\\\______\//\\\/\\\_____\/\\\_______\/\\\_____\/\\\_____ # + __/\\\______\//\\\______\//\\\\\______\//\\\______/\\\______\/\\\_____ # + _\///\\\\\\\\\\\/________\//\\\________\///\\\\\\\\\/____/\\\\\\\\\\\_# + ___\///////////___________\///___________\/////////_____\///////////_# +############################################################################## +S U P E R - V I L L A I N - U I By: Munglunch # +############################################################################## +########################################################## +LOCALIZED LUA FUNCTIONS +########################################################## +]]-- +--[[ GLOBALS ]]-- +local _G = _G; +local unpack = _G.unpack; +local select = _G.select; +local pairs = _G.pairs; +local ipairs = _G.ipairs; +local type = _G.type; +local error = _G.error; +local pcall = _G.pcall; +local tostring = _G.tostring; +local tonumber = _G.tonumber; +local string = _G.string; +local math = _G.math; +--[[ STRING METHODS ]]-- +local format, split = string.format, string.split; +--[[ MATH METHODS ]]-- +local min, floor = math.min, math.floor; +local parsefloat = math.parsefloat; +--[[ +########################################################## +GET ADDON DATA +########################################################## +]]-- +local SV = select(2, ...) +local L = SV.L; + +local Graph = {} + +function Graph:Toggle(enabled) + if((not self.Grid) or (self.CellSize ~= SV.db.general.graphSize)) then + self:Generate() + end + print(enabled) + if(not enabled) then + self.Grid:Hide() + else + self.Grid:Show() + end +end + +function Graph:Generate() + local cellSize = SV.db.general.graphSize + self.CellSize = cellSize + + self.Grid = CreateFrame('Frame', nil, UIParent) + self.Grid:SetAllPoints(SV.Screen) + + local size = 1 + local width = GetScreenWidth() + local ratio = width / GetScreenHeight() + local height = GetScreenHeight() * ratio + + local wStep = width / cellSize + local hStep = height / cellSize + + for i = 0, cellSize do + local tx = self.Grid:CreateTexture(nil, 'BACKGROUND') + if(i == cellSize / 2) then + tx:SetTexture(0, 1, 0, 0.8) + else + tx:SetTexture(0, 0, 0, 0.8) + end + tx:SetPoint("TOPLEFT", self.Grid, "TOPLEFT", i*wStep - (size/2), 0) + tx:SetPoint('BOTTOMRIGHT', self.Grid, 'BOTTOMLEFT', i*wStep + (size/2), 0) + end + + height = GetScreenHeight() + + do + local tx = self.Grid:CreateTexture(nil, 'BACKGROUND') + tx:SetTexture(0, 1, 0, 0.8) + tx:SetPoint("TOPLEFT", self.Grid, "TOPLEFT", 0, -(height/2) + (size/2)) + tx:SetPoint('BOTTOMRIGHT', self.Grid, 'TOPRIGHT', 0, -(height/2 + size/2)) + end + + for i = 1, floor((height/2)/hStep) do + local tx = self.Grid:CreateTexture(nil, 'BACKGROUND') + tx:SetTexture(0, 0, 0, 0.8) + + tx:SetPoint("TOPLEFT", self.Grid, "TOPLEFT", 0, -(height/2+i*hStep) + (size/2)) + tx:SetPoint('BOTTOMRIGHT', self.Grid, 'TOPRIGHT', 0, -(height/2+i*hStep + size/2)) + + tx = self.Grid:CreateTexture(nil, 'BACKGROUND') + tx:SetTexture(0, 0, 0, 0.8) + + tx:SetPoint("TOPLEFT", self.Grid, "TOPLEFT", 0, -(height/2-i*hStep) + (size/2)) + tx:SetPoint('BOTTOMRIGHT', self.Grid, 'TOPRIGHT', 0, -(height/2-i*hStep + size/2)) + end + + self.Grid:Hide() +end + +function Graph:Initialize() + self:Generate() +end + +SV.Graph = Graph; \ No newline at end of file diff --git a/Interface/AddOns/SVUI/framework/movers/mover_mentalo.lua b/Interface/AddOns/SVUI/framework/movers/mover_mentalo.lua index 6712bee..c458ff3 100644 --- a/Interface/AddOns/SVUI/framework/movers/mover_mentalo.lua +++ b/Interface/AddOns/SVUI/framework/movers/mover_mentalo.lua @@ -480,7 +480,8 @@ local Movable_OnEnter = function(self) if TheHand.UserHeld then return end ResetAllAlphas() self:SetAlpha(1) - self.text:SetTextColor(1, 1, 1) + self.text:SetTextColor(0, 1, 1) + self:SetBackdropBorderColor(0, 0.7, 1) UpdateFrameTarget = self; SVUI_Mentalo.Avatar:SetTexture([[Interface\AddOns\SVUI\assets\artwork\Doodads\MENTALO-ON]]) TheHand:SetPoint("CENTER", self, "TOP", 0, 0) @@ -493,7 +494,8 @@ end local Movable_OnLeave = function(self) if TheHand.UserHeld then return end - self.text:SetTextColor(0.1, 0.8, 0.8) + self.text:SetTextColor(0.5, 0.5, 0.5) + self:SetBackdropBorderColor(0.5, 0.5, 0.5) SVUI_Mentalo.Avatar:SetTexture([[Interface\AddOns\SVUI\assets\artwork\Doodads\MENTALO-OFF]]) TheHand:Hide() if(CurrentFrameTarget ~= self and not SVUI_MentaloPrecision:IsShown()) then @@ -519,7 +521,7 @@ local Movable_OnMouseDown = function(self, arg) end local Movable_OnShow = function(self) - self:SetBackdropBorderColor(0.1, 0.8, 0.8) + self:SetBackdropBorderColor(0.5, 0.5, 0.5) end --[[ ########################################################## @@ -579,7 +581,7 @@ function Mentalo:New(frame, moveName, title, raised, snap, dragStopFunc) mtext:SetJustifyH("CENTER") mtext:SetPoint("CENTER") mtext:SetText(title or moveName) - mtext:SetTextColor(0.1, 0.8, 0.8) + mtext:SetTextColor(0.5, 0.5, 0.5) movable:SetFontString(mtext) movable.text = mtext; @@ -640,12 +642,6 @@ function Mentalo:Add(frame, title, raised, snapOffset, dragStopFunc, movableGrou self.Frames[moveName]["postdrag"] = dragStopFunc; self.Frames[moveName]["snapoffset"] = snapOffset; self.Frames[moveName]["point"] = CurrentPosition(frame) - self.Frames[moveName]["type"] = {} - local group = {split(", ", movableGroup)} - for i = 1, #group do - local this = group[i] - self.Frames[moveName]["type"][this] = true - end end self:New(frame, moveName, title, raised, snapOffset, dragStopFunc) @@ -712,7 +708,7 @@ function Mentalo:SetPositions() end end -function Mentalo:Toggle(isConfigMode, configType) +function Mentalo:Toggle(isConfigMode) if(InCombatLockdown()) then return end local enabled = false; if(isConfigMode ~= nil and isConfigMode ~= "") then @@ -738,21 +734,13 @@ function Mentalo:Toggle(isConfigMode, configType) enabled = true end - if(not configType or (configType and type(configType) ~= "string")) then - configType = "ALL" - end - for frameName, _ in pairs(self.Frames)do if(_G[frameName]) then local movable = _G[frameName] if(not enabled) then movable:Hide() else - if self.Frames[frameName]["type"][configType]then - movable:Show() - else - movable:Hide() - end + movable:Show() end end end @@ -769,12 +757,22 @@ local XML_Mentalo_OnEvent = function(self) end end +local XML_MentaloGridButton_OnClick = function(self) + local enabled = true + if(SV.Graph.Grid and SV.Graph.Grid:IsShown()) then + enabled = false + end + + SV.Graph:Toggle(enabled) +end + local XML_MentaloLockButton_OnClick = function(self) + SV.Graph:Toggle() Mentalo:Toggle(true) if IsAddOnLoaded(SV.ConfigID)then LibStub("AceConfigDialog-3.0"):Open(SV.NameID) end -end +end local SVUI_MentaloPrecisionResetButton_OnClick = function(self) if(not CurrentFrameTarget) then return end @@ -825,6 +823,7 @@ function Mentalo:Initialize() SVUI_Mentalo:RegisterEvent("PLAYER_REGEN_DISABLED") SVUI_Mentalo:SetScript("OnEvent", XML_Mentalo_OnEvent) + SVUI_MentaloGridButton:SetScript("OnClick", XML_MentaloGridButton_OnClick) SVUI_MentaloLockButton:SetScript("OnClick", XML_MentaloLockButton_OnClick) SVUI_MentaloPrecision:SetPanelTemplate("Transparent") diff --git a/Interface/AddOns/SVUI/framework/movers/movers.xml b/Interface/AddOns/SVUI/framework/movers/movers.xml index e5f19c4..b673c63 100644 --- a/Interface/AddOns/SVUI/framework/movers/movers.xml +++ b/Interface/AddOns/SVUI/framework/movers/movers.xml @@ -224,14 +224,22 @@ </Layer> </Layers> <Frames> - <Button name="$parentLockButton" inherits="OptionsButtonTemplate" text="Lock"> - <Size x="96" y="24"/> + <Button name="$parentGridButton" inherits="OptionsButtonTemplate" text="Grid"> + <Size x="48" y="24"/> <Anchors> <Anchor point="RIGHT" relativeTo="$parentBG"> <Offset x="-4" y="0"/> </Anchor> </Anchors> </Button> + <Button name="$parentLockButton" inherits="OptionsButtonTemplate" text="Lock"> + <Size x="48" y="24"/> + <Anchors> + <Anchor point="RIGHT" relativeTo="$parentGridButton" relativePoint="LEFT"> + <Offset x="-4" y="0"/> + </Anchor> + </Anchors> + </Button> </Frames> <Scripts> <OnHide> @@ -248,6 +256,7 @@ </Scripts> </Frame> + <Script file="mover_graph.lua"/> <Script file="mover_mentalo.lua"/> <Script file="mover_blizzard.lua"/> </Ui> \ No newline at end of file diff --git a/Interface/AddOns/SVUI/packages/map/SVMap.lua b/Interface/AddOns/SVUI/packages/map/SVMap.lua index 4bc3a65..be789bf 100644 --- a/Interface/AddOns/SVUI/packages/map/SVMap.lua +++ b/Interface/AddOns/SVUI/packages/map/SVMap.lua @@ -715,9 +715,9 @@ function MOD:Load() Minimap:SetCorpsePOIArrowTexture("Interface\\AddOns\\SVUI\\assets\\artwork\\Minimap\\MINIMAP_CORPSE_ARROW") Minimap:SetPOIArrowTexture("Interface\\AddOns\\SVUI\\assets\\artwork\\Minimap\\MINIMAP_GUIDE_ARROW") if(SV.db.SVMap.customIcons) then - Minimap:SetBlipTexture("Interface\\AddOns\\SVUI\\assets\\artwork\\Minimap\\MINIMAP_ICONS") + Minimap:SetBlipTexture("Interface\\AddOns\\SVUI\\assets\\artwork\\Minimap\\MINIMAP-OBJECTICONS") else - Minimap:SetBlipTexture("Interface\\Minimap\\OBJECTICONS") + Minimap:SetBlipTexture("Interface\\AddOns\\SVUI\\assets\\artwork\\Minimap\\DEFAULT-OBJECTICONS") end Minimap:SetClampedToScreen(false) diff --git a/Interface/AddOns/SVUI/packages/tools/components/garrison.lua b/Interface/AddOns/SVUI/packages/tools/components/garrison.lua index bbfb8f3..a9117d6 100644 --- a/Interface/AddOns/SVUI/packages/tools/components/garrison.lua +++ b/Interface/AddOns/SVUI/packages/tools/components/garrison.lua @@ -69,6 +69,7 @@ local SV = select(2, ...) local L = SV.L local MOD = SV.SVTools; +local GarrisonData = {}; --[[ ########################################################## LOCALS @@ -135,17 +136,39 @@ local function getColoredString(text, color) end local function GetActiveMissions() + wipe(GarrisonData) local hasMission = false GameTooltip:AddLine(" ", 1, 1, 1) - GameTooltip:AddLine("Missions", 1, 1, 0) + GameTooltip:AddLine("Active Missions", 1, 0.7, 0) + for key,data in pairs(C_Garrison.GetInProgressMissions()) do - local mission = ("%s|cff888888 - |r|cffFF5500%s|r"):format(data.level, data.name); + GarrisonData[data.missionID] = { + name = data.name, + level = data.level, + seconds = data.durationSeconds, + timeLeft = data.timeLeft, + completed = false, + isRare = data.isRare, + type = data.type, + } + hasMission = true + end + + for key,data in pairs(C_Garrison.GetCompleteMissions()) do + if(GarrisonData[data.missionID]) then + GarrisonData[data.missionID].completed = true + end + end + + for key,data in pairs(GarrisonData) do + local hex = data.isRare and "blue" or "green" + local mission = ("%s|cff888888 - |r%s"):format(getColoredString(data.level, "yellow"), getColoredString(data.name, hex)); local remaining - if (data.timeLeft == '0') then + if (data.completed) then remaining = L["Complete!"] else - remaining = ("%s %s"):format(data.timeLeft, getColoredString(" ("..SV:ParseSeconds(data.durationSeconds)..")", "lightgrey")) + remaining = ("%s %s"):format(data.timeLeft, getColoredString(" ("..SV:ParseSeconds(data.seconds)..")", "lightgrey")) end GameTooltip:AddDoubleLine(mission, remaining, 0, 1, 0, 1, 1, 1) @@ -153,12 +176,54 @@ local function GetActiveMissions() end if(not hasMission) then - GameTooltip:AddLine("No Active Missions", 1, 1, 1) + GameTooltip:AddLine("None", 1, 0, 0) + end +end + +local function GetBuildingData() + local hasBuildings = false + local now = time(); + + GameTooltip:AddLine(" ", 1, 1, 1) + GameTooltip:AddLine("Buildings", 1, 0.7, 0) + + local buildings = C_Garrison.GetBuildings() + for i = 1, #buildings do + local buildingID = buildings[i].buildingID + local plotID = buildings[i].plotID + + local id, name, texPrefix, icon, rank, isBuilding, timeStart, buildTime, canActivate, canUpgrade, isPrebuilt = C_Garrison.GetOwnedBuildingInfoAbbrev(plotID) + + local building = ''; + local remaining + + if(isBuilding) then + building = ("|cffFFFF00%s|r|cff888888 - |r|cffFF5500%s|r"):format(rank, name); + local timeLeft = buildTime - (now - timeStart); + if(canActivate or timeLeft < 0) then + remaining = L["Complete!"] + else + remaining = ("Building %s"):format(getColoredString("("..SV:ParseSeconds(timeLeft)..")", "lightgrey")) + end + GameTooltip:AddDoubleLine(building, remaining, 0, 1, 0, 1, 1, 1) + else + local name, texture, shipmentCapacity, shipmentsReady, shipmentsTotal, creationTime, duration, timeleftString, itemName, itemIcon, itemQuality, itemID = C_Garrison.GetLandingPageShipmentInfo(buildingID) + if(shipmentsReady and shipmentsReady > 0) then + building = ("|cffFFFF00%s|r|cff888888 - |r|cffFF5500%s|r"):format(rank, name); + remaining = ("Ready: %s, Next: %s"):format(getColoredString(shipmentsReady, "green"), getColoredString(timeleftString, "lightgrey")) + elseif(timeleftString) then + building = ("|cffFFFF00%s|r|cff888888 - |r|cffFF5500%s|r"):format(rank, name); + remaining = ("Next: %s"):format(getColoredString(timeleftString, "lightgrey")) + end + GameTooltip:AddDoubleLine(building, remaining, 0, 1, 0, 1, 1, 1) + end + + hasBuildings = true end - -- for key,garrisonMission in pairs(C_Garrison.GetCompleteMissions()) do - -- DO STUFF - -- end + if(not hasBuildings) then + GameTooltip:AddLine("None", 1, 0, 0) + end end local SetGarrisonTooltip = function(self) @@ -173,6 +238,7 @@ local SetGarrisonTooltip = function(self) GameTooltip:AddDoubleLine(L["Time Remaining"], remaining, 1, 1, 1, 0, 1, 1) end GetActiveMissions() + GetBuildingData() end local function LoadToolBarGarrison() diff --git a/Interface/AddOns/SVUI/system/configs.lua b/Interface/AddOns/SVUI/system/configs.lua index ecdf050..7b316c7 100644 --- a/Interface/AddOns/SVUI/system/configs.lua +++ b/Interface/AddOns/SVUI/system/configs.lua @@ -68,7 +68,8 @@ SV.configs["general"] = { ["reactionEmote"] = false, ["sharingiscaring"] = false, ["arenadrink"] = true, - ["stupidhat"] = true, + ["stupidhat"] = true, + ["graphSize"] = 64, } SV.configs["LAYOUT"] = { diff --git a/Interface/AddOns/SVUI/system/media.lua b/Interface/AddOns/SVUI/system/media.lua index 2a651d9..6274306 100644 --- a/Interface/AddOns/SVUI/system/media.lua +++ b/Interface/AddOns/SVUI/system/media.lua @@ -155,6 +155,7 @@ do ["lightgrey"] = {0.32, 0.35, 0.38, 1}, ["highlight"] = {0.1, 0.8, 0.8, 1}, ["green"] = {0.25, 0.9, 0.08, 1}, + ["blue"] = {0.08, 0.25, 0.9, 1}, ["red"] = {0.9, 0.08, 0.08, 1}, ["yellow"] = {1, 1, 0, 1}, ["transparent"] = {0, 0, 0, 0.5}, diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/_load.xml b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/_load.xml index 0c36331..330b1b0 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/_load.xml +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/_load.xml @@ -13,6 +13,7 @@ <Script file='dressup.lua'/> <Script file='encounterjournal.lua'/> <Script file='friends.lua'/> + <Script file='garrison.lua'/> <Script file='gossip.lua'/> <Script file='guild.lua'/> <Script file='help.lua'/> diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/dressup.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/dressup.lua index 1879780..f818fe9 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/dressup.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/dressup.lua @@ -32,7 +32,7 @@ local function DressUpStyle() return end - DressUpFrame:Size(600, 500) + DressUpFrame:Size(600, 700) PLUGIN:ApplyWindowStyle(DressUpFrame, true, true) DressUpModel:ClearAllPoints() diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/garrison.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/garrison.lua index c2dbdcb..bc7b818 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/garrison.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/garrison.lua @@ -37,23 +37,25 @@ local GarrisonButtonList = { STYLE ########################################################## ]]-- +local _hook_ReagentUpdate = function(self) + local reagents = GarrisonCapacitiveDisplayFrame.CapacitiveDisplay.Reagents; + for i = 1, #reagents do + if(reagents[i] and (not reagents[i].Panel)) then + reagents[i]:RemoveTextures() + reagents[i]:SetSlotTemplate(true, 2, 0, 0, true) + if(reagents[i].Icon) then + reagents[i].Icon:SetTexCoord(0.1, 0.9, 0.1, 0.9) + end + end + end +end + local function LoadGarrisonStyle() if PLUGIN.db.blizzard.enable ~= true then return end - PLUGIN:ApplyScrollFrameStyle(GarrisonLandingPageListListScrollFrameScrollBar) - PLUGIN:ApplyCloseButtonStyle(GarrisonLandingPage.CloseButton) - GarrisonLandingPage.CloseButton:SetFrameStrata("HIGH") - - for i = 1, GarrisonLandingPageListListScrollFrameScrollChild:GetNumChildren() do - local child = select(i, GarrisonLandingPageListListScrollFrameScrollChild:GetChildren()) - for j = 1, child:GetNumChildren() do - local childC = select(j, child:GetChildren()) - childC.Icon:SetTexCoord(0.1,0.9,0.1,0.9) - end - end - + --print("Test") local display = GarrisonCapacitiveDisplayFrame display:RemoveTextures(true) GarrisonCapacitiveDisplayFrameInset:RemoveTextures(true) @@ -63,12 +65,21 @@ local function LoadGarrisonStyle() display.CapacitiveDisplay.ShipmentIconFrame.Icon:SetTexCoord(0.1, 0.9, 0.1, 0.9) display:SetPanelTemplate('Action') - local reagents = display.Reagents; - for i = 1, C_Garrison.GetNumShipmentReagents() do - reagents[i]:SetSlotTemplate(true, 2, 0, 0, true) - reagents[i].Icon:SetTexCoord(0.1, 0.9, 0.1, 0.9) + --print("Test") + local reagents = display.CapacitiveDisplay.Reagents; + for i = 1, #reagents do + if(reagents[i]) then + reagents[i]:RemoveTextures() + reagents[i]:SetSlotTemplate(true, 2, 0, 0, true) + if(reagents[i].Icon) then + reagents[i].Icon:SetTexCoord(0.1, 0.9, 0.1, 0.9) + end + end end + hooksecurefunc("GarrisonCapacitiveDisplayFrame_Update", _hook_ReagentUpdate) + + -- print("Test") for i = 1, #GarrisonButtonList do local button = GarrisonCapacitiveDisplayFrame[GarrisonButtonList[i]] if(button) then @@ -76,6 +87,25 @@ local function LoadGarrisonStyle() button:SetButtonTemplate() end end + + --print("Test") + PLUGIN:ApplyScrollFrameStyle(GarrisonLandingPageReportListListScrollFrameScrollBar) + PLUGIN:ApplyCloseButtonStyle(GarrisonLandingPage.CloseButton) + GarrisonLandingPage.CloseButton:SetFrameStrata("HIGH") + + --print("Test") + for i = 1, GarrisonLandingPageReportListListScrollFrameScrollChild:GetNumChildren() do + local child = select(i, GarrisonLandingPageReportListListScrollFrameScrollChild:GetChildren()) + for j = 1, child:GetNumChildren() do + local childC = select(j, child:GetChildren()) + childC.Icon:SetTexCoord(0.1,0.9,0.1,0.9) + end + end + + --print("Test") + PLUGIN:ApplyScrollFrameStyle(GarrisonLandingPageListScrollFrameScrollBar) + + --print("Test Done") end --[[ ########################################################## diff --git a/Interface/BUTTONS/Thumbs.db b/Interface/BUTTONS/Thumbs.db new file mode 100644 index 0000000..9a524d6 Binary files /dev/null and b/Interface/BUTTONS/Thumbs.db differ diff --git a/Interface/Characterframe/Thumbs.db b/Interface/Characterframe/Thumbs.db deleted file mode 100644 index e66b1c5..0000000 Binary files a/Interface/Characterframe/Thumbs.db and /dev/null differ