From f0aac0b382aa4901b0b51afe35b766f2a8b827e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?tekkub=20=CA=95=20=C2=B4=E1=B4=A5=60=20=CA=94?= Date: Sat, 10 Sep 2016 19:01:22 -0600 Subject: [PATCH] Clean up MerchantItem a bit --- frames/MerchantItem.lua | 64 ++++++++++++++++++++++++----------------- 1 file changed, 37 insertions(+), 27 deletions(-) diff --git a/frames/MerchantItem.lua b/frames/MerchantItem.lua index 1ae7390..908d937 100644 --- a/frames/MerchantItem.lua +++ b/frames/MerchantItem.lua @@ -28,6 +28,29 @@ local function OnClick(self, button) end +local function OnDragStart(self, button) + MerchantFrame.extendedCost = nil + PickupMerchantItem(self:GetID()) + if self.extendedCost then MerchantFrame.extendedCost = self end +end + + +local function OnEnter(self) + GameTooltip:SetOwner(self, "ANCHOR_RIGHT") + GameTooltip:SetMerchantItem(self:GetID()) + GameTooltip_ShowCompareItem() + MerchantFrame.itemHover = self:GetID() + if IsModifiedClick("DRESSUP") then ShowInspectCursor() else ResetCursor() end +end + + +local function OnLeave() + GameTooltip:Hide() + ResetCursor() + MerchantFrame.itemHover = nil +end + + function ns.Purchase(id, quantity) local _, _, _, _, available = GetMerchantItemInfo(id) local max = GetMerchantItemMaxStack(id) @@ -65,9 +88,15 @@ local function SetValue(self, i) self.backdrop:SetShown(shown) self.icon:SetTexture(itemTexture) + self.icon:SetVertexColor(ns.GetRowVertexColor(i)) local textcolor = ns.GetRowTextColor(i) - self.ItemName:SetText((numAvailable > -1 and ("["..numAvailable.."] ") or "").. textcolor.. (name or "").. (itemStackCount > 1 and ("|r x"..itemStackCount) or "")) + local text = + (numAvailable > -1 and ("["..numAvailable.."] ") or "").. + textcolor.. + (name or "").. + (itemStackCount > 1 and ("|r x"..itemStackCount) or "") + self.ItemName:SetText(text) self.AltCurrency:SetValue(i) @@ -86,8 +115,6 @@ local function SetValue(self, i) else self.extendedCost = nil end - - self.icon:SetVertexColor(ns.GetRowVertexColor(i)) end @@ -95,19 +122,18 @@ function ns.NewMerchantItemFrame(parent) local frame = CreateFrame("Button", nil, parent) frame:SetHeight(HEIGHT) - frame.BuyItem = BuyItem - frame:SetHighlightTexture("Interface\\HelpFrame\\HelpFrameButton-Highlight") frame:GetHighlightTexture():SetTexCoord(0, 1, 0, 0.578125) frame:RegisterForClicks("AnyUp") - frame:SetScript('OnClick', OnClick) frame:RegisterForDrag("LeftButton") - frame:SetScript('OnDragStart', function(self, button) - MerchantFrame.extendedCost = nil - PickupMerchantItem(self:GetID()) - if self.extendedCost then MerchantFrame.extendedCost = self end - end) + frame:SetScript("OnClick", OnClick) + frame:SetScript("OnDragStart", OnDragStart) + frame:SetScript("OnEnter", OnEnter) + frame:SetScript("OnLeave", OnLeave) + + frame.BuyItem = BuyItem + frame.SetValue = SetValue local backdrop = frame:CreateTexture(nil, "BACKGROUND") backdrop:SetAllPoints() @@ -141,21 +167,5 @@ function ns.NewMerchantItemFrame(parent) ItemName:SetJustifyH("LEFT") frame.ItemName = ItemName - frame:SetScript('OnEnter', function(self) - GameTooltip:SetOwner(self, "ANCHOR_RIGHT") - GameTooltip:SetMerchantItem(self:GetID()) - GameTooltip_ShowCompareItem() - MerchantFrame.itemHover = self:GetID() - if IsModifiedClick("DRESSUP") then ShowInspectCursor() else ResetCursor() end - end) - - frame:SetScript('OnLeave', function() - GameTooltip:Hide() - ResetCursor() - MerchantFrame.itemHover = nil - end) - - frame.SetValue = SetValue - return frame end