Merge branch 'dev'

.luacheckrc

@@ -41,6 +41,7 @@ read_globals = {
 	"CreateFrame",
 	"GetCursorPosition",
 	"GetGameTime",
+	"GetItemInfo",
 	"GetMinimapZoneText",
 	"GetZonePVPInfo",
 	"IsAddOnLoaded",
@@ -67,13 +68,13 @@ read_globals = {
 	"C_MountJournal",
 	"C_PvP",
 	"C_Timer",
+	"C_WowTokenPublic",
 
 	-- FrameXML functions
 	"CastingBarFrame_SetUnit",
 	"Minimap_ZoomIn",
 	"Minimap_ZoomOut",
 	"MiniMapTracking_OnMouseDown",
-	"Mixin",
 	"RegisterStateDriver",
 	"UIDropDownMenu_GetCurrentDropDown",
 	"UnitFrame_OnEnter",
@@ -110,4 +111,6 @@ read_globals = {
 	-- FrameXML vars
 	"ChatTypeInfo",
 	"DEFAULT_CHAT_FRAME",
+	"ITEM_QUALITY_COLORS",
+	"WOW_TOKEN_ITEM_ID",
 }

CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## Version 90005.02
+
+- Added WoW Token price to the "Inventory" micro button's tooltip;
+- Fixed misc class power bar issues.
+
 ## Version 90005.01
 
 - Added 125% and 150% size options for the round minimap. Can be found at /LSUI > Minimap > Size

core/border.lua

@@ -102,7 +102,7 @@ function border_proto:IsObjectType(_, t)
 end
 
 function E:CreateBorder(parent, drawLayer, drawSubLevel)
-	local border = Mixin({__parent = parent}, border_proto)
+	local border = P:Mixin({__parent = parent}, border_proto)
 
 	for _, v in next, sections do
 		border[v] = parent:CreateTexture(nil, drawLayer or "OVERLAY", nil, drawSubLevel or 1)

core/core.lua

@@ -9,6 +9,7 @@ local next = _G.next
 local pairs = _G.pairs
 local s_format = _G.string.format
 local s_split = _G.string.split
+local select = _G.select
 local t_insert = _G.table.insert
 local type = _G.type
 local xpcall = _G.xpcall
@@ -70,6 +71,39 @@ do
 	end
 end
 
+------------
+-- MIXINS --
+------------
+
+do
+	-- not sure about this implementation just yet, but I'll try using it for
+	-- profiling later on
+	local registry = {
+		-- [obj] = {["method"] = func,},
+	}
+
+	function P:Mixin(obj, ...)
+		registry[obj] = {}
+
+		for i = 1, select("#", ...) do
+			local mixin = select(i, ...)
+			for k, v in next, mixin do
+				if type(v) == "function" then
+					registry[obj][k] = v
+				end
+
+				obj[k] = v
+			end
+		end
+
+		return obj
+	end
+
+	function P:GetMixedInRegistry()
+		return registry
+	end
+end
+
 ------------
 -- ERRORS --
 ------------

ls_UI.toc

@@ -1,6 +1,6 @@
 ## Interface: 90005
 ## Author: lightspark
-## Version: 90005.01
+## Version: 90005.02
 ## Title: LS: |cff1a9fc0UI|r
 ## Notes: Yet another UI, but this one is a bit special...
 ## SavedVariablesPerCharacter: LS_UI_CHAR_CONFIG

modules/bars/micromenu.lua

@@ -65,6 +65,7 @@ local BUTTONS = {
 		icon = "INVENTORY",
 		events = {
 			BAG_UPDATE_DELAYED = true,
+			TOKEN_MARKET_PRICE_UPDATED = true,
 		},
 	},
 	spellbook = {
@@ -485,6 +486,7 @@ do
 	local CURRENCY_DETAILED_TEMPLATE = "%s / %s|T%s:0|t"
 
 	local freeSlots, totalSlots = 0, 0
+	local lastTokenUpdate = 0
 
 	local function updateBagUsageInfo()
 		freeSlots, totalSlots = 0, 0
@@ -523,6 +525,15 @@ do
 
 			GameTooltip:AddDoubleLine(L["GOLD"], GetMoneyString(GetMoney(), true), 1, 1, 1, 1, 1, 1)
 
+			local tokenPrice = C_WowTokenPublic.GetCurrentMarketPrice()
+			if tokenPrice and tokenPrice > 0 then
+				local name, _, quality = GetItemInfo(WOW_TOKEN_ITEM_ID)
+				local color =  ITEM_QUALITY_COLORS[quality]
+				GameTooltip:AddDoubleLine(name, GetMoneyString(tokenPrice, true), color.r, color.g, color.b, 1, 1, 1)
+			elseif GetTime() - lastTokenUpdate > 300 then -- 300 is pollTimeSeconds = select(2, C_WowTokenPublic.GetCommerceSystemStatus())
+				C_WowTokenPublic.UpdateMarketPrice()
+			end
+
 			if C.db.profile.bars.micromenu.bars.bags.enabled then
 				GameTooltip:AddLine(" ")
 				GameTooltip:AddLine(L["INVENTORY_BUTTON_RCLICK_TOOLTIP"])
@@ -550,11 +561,23 @@ do
 		end
 	end
 
-	function inventoryButton_OnEvent(self, event)
+	function inventoryButton_OnEvent(self, event, ...)
 		if event == "BAG_UPDATE_DELAYED" then
 			self:UpdateIndicator()
 		elseif event == "UPDATE_BINDINGS" then
 			self.tooltipText = MicroButtonTooltipText(L["INVENTORY_BUTTON"], "OPENALLBAGS")
+		elseif event == "TOKEN_MARKET_PRICE_UPDATED" then
+			lastTokenUpdate = GetTime()
+
+			if ... == LE_TOKEN_RESULT_ERROR_DISABLED then
+				return
+			end
+
+			if GameTooltip:IsOwned(self) then
+				GameTooltip:Hide()
+
+				inventoryButton_OnEnter(self)
+			end
 		end
 	end
 

modules/minimap/minimap.lua

@@ -875,7 +875,7 @@ function MODULE:Init()
 		holder:SetPoint(unpack(C.db.profile.minimap[E.UI_LAYOUT].point))
 		E.Movers:Create(holder)
 
-		Mixin(Minimap, minimap_proto)
+		P:Mixin(Minimap, minimap_proto)
 		Minimap:EnableMouseWheel()
 		Minimap:ClearAllPoints()
 		Minimap:SetParent(holder)
@@ -895,7 +895,7 @@ function MODULE:Init()
 		ignoredChildren[textureParent] = true
 
 		if isSquare then
-			Mixin(Minimap, square_minimap_proto)
+			P:Mixin(Minimap, square_minimap_proto)
 			Minimap:SetArchBlobRingScalar(0)
 			Minimap:SetQuestBlobRingScalar(0)
 			Minimap:SetMaskTexture("Interface\\BUTTONS\\WHITE8X8")

modules/unitframes/elements/auras.lua

@@ -197,7 +197,7 @@ function element_proto:CreateIcon(index)
 		config = self._config
 	end
 
-	local button = Mixin(E:CreateButton(self, "$parentAura" .. index, true, true, true), button_proto)
+	local button = P:Mixin(E:CreateButton(self, "$parentAura" .. index, true, true, true), button_proto)
 	button:SetScript("OnEnter", button.OnEnter)
 	button:SetScript("OnLeave", button.OnLeave)
 
@@ -383,9 +383,9 @@ function frame_proto:UpdateAuras()
 end
 
 function UF:CreateAuras(frame, unit)
-	Mixin(frame, frame_proto)
+	P:Mixin(frame, frame_proto)
 
-	local element = Mixin(CreateFrame("Frame", nil, frame), element_proto)
+	local element = P:Mixin(CreateFrame("Frame", nil, frame), element_proto)
 	element:SetSize(48, 48)
 
 	element.CustomFilter = filterFunctions[unit] or filterFunctions.default

modules/unitframes/elements/castbar.lua

@@ -212,11 +212,11 @@ function frame_proto:UpdateCastbar()
 end
 
 function UF:CreateCastbar(frame)
-	Mixin(frame, frame_proto)
+	P:Mixin(frame, frame_proto)
 
 	local holder = CreateFrame("Frame", "$parentCastbarHolder", frame)
 
-	local element = Mixin(CreateFrame("StatusBar", nil, holder), element_proto)
+	local element = P:Mixin(CreateFrame("StatusBar", nil, holder), element_proto)
 	element:SetStatusBarTexture("Interface\\BUTTONS\\WHITE8X8")
 	element:SetFrameLevel(holder:GetFrameLevel())
 	element.Holder = holder

modules/unitframes/elements/classindicator.lua

@@ -61,7 +61,7 @@ function frame_proto:UpdateClassIndicator()
 end
 
 function UF:CreateClassIndicator(frame)
-	Mixin(frame, frame_proto)
+	P:Mixin(frame, frame_proto)
 
 	hooksecurefunc(frame, "Show", update)
 
@@ -73,7 +73,7 @@ function UF:CreateClassIndicator(frame)
 		E:SmoothColor(frame.Insets)
 	end
 
-	return Mixin({
+	return P:Mixin({
 		__owner = frame,
 		__color = {},
 	}, element_proto)

modules/unitframes/elements/classpower.lua

@@ -33,7 +33,7 @@ local function bar_OnValueChanged(self, value)
 end
 
 local function createElement(parent, num, name, ...)
-	local element = Mixin(CreateFrame("Frame", nil, parent), ...)
+	local element = P:Mixin(CreateFrame("Frame", nil, parent), ...)
 	element:SetScript("OnSizeChanged", element.Layout)
 	element:Hide()
 
@@ -228,7 +228,7 @@ do
 	end
 
 	function UF:CreateRunes(frame)
-		Mixin(frame, frame_proto)
+		P:Mixin(frame, frame_proto)
 
 		return createElement(frame, 6, "Rune", element_proto, runes_proto)
 	end
@@ -280,7 +280,9 @@ do
 				end
 
 				for i = max, #self - 1 do
-					self[i].Sep:Hide()
+					if i > 0 then
+						self[i].Sep:Hide()
+					end
 				end
 			end
 
@@ -341,7 +343,7 @@ do
 	end
 
 	function UF:CreateClassPower(frame)
-		Mixin(frame, frame_proto)
+		P:Mixin(frame, frame_proto)
 
 		return createElement(frame, 10, "ClassPower", element_proto, class_power_proto)
 	end
@@ -425,9 +427,9 @@ do
 	end
 
 	function UF:CreateStagger(frame)
-		Mixin(frame, frame_proto)
+		P:Mixin(frame, frame_proto)
 
-		local element = Mixin(CreateFrame("StatusBar", nil, frame), stagger_proto)
+		local element = P:Mixin(CreateFrame("StatusBar", nil, frame), stagger_proto)
 		element:SetStatusBarTexture("Interface\\BUTTONS\\WHITE8X8")
 		element:Hide()
 

modules/unitframes/elements/debuffindicator.lua

@@ -62,9 +62,9 @@ function frame_proto:UpdateDebuffIndicator()
 end
 
 function UF:CreateDebuffIndicator(frame, textParent)
-	Mixin(frame, frame_proto)
+	P:Mixin(frame, frame_proto)
 
-	local element = Mixin((textParent or frame):CreateFontString(nil, "ARTWORK"), element_proto)
+	local element = P:Mixin((textParent or frame):CreateFontString(nil, "ARTWORK"), element_proto)
 	element:SetFont(GameFontNormal:GetFont(), 12)
 	element:SetNonSpaceWrap(true)
 	element:SetJustifyH("CENTER")

modules/unitframes/elements/health.lua

@@ -118,9 +118,9 @@ do
 	end
 
 	function UF:CreateHealth(frame, textParent)
-		Mixin(frame, frame_proto)
+		P:Mixin(frame, frame_proto)
 
-		local element = Mixin(CreateFrame("StatusBar", nil, frame), element_proto)
+		local element = P:Mixin(CreateFrame("StatusBar", nil, frame), element_proto)
 		element:SetStatusBarTexture("Interface\\BUTTONS\\WHITE8X8")
 		element._texture = element:GetStatusBarTexture()
 
@@ -270,7 +270,7 @@ do
 	end
 
 	function UF:CreateHealthPrediction(frame, parent)
-		Mixin(frame, frame_proto)
+		P:Mixin(frame, frame_proto)
 
 		local level = parent:GetFrameLevel()
 
@@ -303,7 +303,7 @@ do
 		healAbsorbBar._texture = healAbsorbBar:GetStatusBarTexture()
 		parent.HealAbsorb = healAbsorbBar
 
-		return Mixin({
+		return P:Mixin({
 			myBar = myBar,
 			otherBar = otherBar,
 			absorbBar = absorbBar,

modules/unitframes/elements/layout.lua

@@ -381,7 +381,7 @@ local DATA = {
 }
 
 function UF:CreateLayout(frame, level)
-	Mixin(frame, frame_proto)
+	P:Mixin(frame, frame_proto)
 
 	local bg = frame:CreateTexture(nil, "BACKGROUND", nil, -7)
 	bg:SetAllPoints()
@@ -406,11 +406,11 @@ function UF:CreateLayout(frame, level)
 	textParent:SetAllPoints()
 	frame.TextParent = textParent
 
-	local insets = Mixin({__owner = frame}, insets_proto)
+	local insets = P:Mixin({__owner = frame}, insets_proto)
 	frame.Insets = insets
 
 	for _, v in next, {"Left", "Right", "Top", "Bottom"} do
-		local inset = Mixin(CreateFrame("Frame", nil, frame), unpack(DATA[v].mixins))
+		local inset = P:Mixin(CreateFrame("Frame", nil, frame), unpack(DATA[v].mixins))
 		inset:SetFrameLevel(level)
 		inset:SetScript("OnSizeChanged", inset.OnSizeChanged)
 		inset.__owner = insets
@@ -540,7 +540,7 @@ function slot_proto:UpdateSize(w, h)
 end
 
 function UF:CreateSlot(frame, level)
-	local slot = Mixin(CreateFrame("Frame", nil, frame), slot_proto)
+	local slot = P:Mixin(CreateFrame("Frame", nil, frame), slot_proto)
 	slot:SetFrameLevel(level)
 	slot.__children = {}
 

modules/unitframes/elements/name.lua

@@ -56,9 +56,9 @@ function frame_proto:UpdateName()
 end
 
 function UF:CreateName(frame, textParent)
-	Mixin(frame, frame_proto)
+	P:Mixin(frame, frame_proto)
 
-	local element = Mixin((textParent or frame):CreateFontString(nil, "OVERLAY"), element_proto)
+	local element = P:Mixin((textParent or frame):CreateFontString(nil, "OVERLAY"), element_proto)
 	element.__owner = frame
 	E.FontStrings:Capture(element, "unit")
 

modules/unitframes/elements/portrait.lua

@@ -51,10 +51,10 @@ function frame_proto:UpdatePortrait()
 end
 
 function UF:CreatePortrait(frame, parent)
-	Mixin(frame, frame_proto)
+	P:Mixin(frame, frame_proto)
 
-	frame.Portrait2D = Mixin((parent or frame):CreateTexture(nil, "ARTWORK"), element_proto)
-	frame.Portrait3D = Mixin(CreateFrame("PlayerModel", nil, parent or frame), element_proto)
+	frame.Portrait2D = P:Mixin((parent or frame):CreateTexture(nil, "ARTWORK"), element_proto)
+	frame.Portrait3D = P:Mixin(CreateFrame("PlayerModel", nil, parent or frame), element_proto)
 
 	return frame.Portrait2D
 end