From 21767fc14d4bfde1bfa857e80aaefbcf2a165687 Mon Sep 17 00:00:00 2001 From: Manuel Simon Hirsig Date: Wed, 3 Feb 2016 14:08:04 +0100 Subject: [PATCH] improved shopping tooltip displaying --- gui.lua | 3 ++- info.lua | 23 +++++++++++++---------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/gui.lua b/gui.lua index 1a2409a..2e8d5d6 100644 --- a/gui.lua +++ b/gui.lua @@ -576,7 +576,8 @@ function m.slider(frame, name) -- editbox:SetScript('OnTextChanged', EditBox_OnTextChanged) -- editbox:SetScript('OnEnter', Control_OnEnter) -- editbox:SetScript('OnLeave', Control_OnLeave) - editbox:SetFont(m.config.content_font, m.config.normal_font_size) +-- editbox:SetFont(m.config.content_font, m.config.normal_font_size) + editbox:SetFont(m.config.content_font, m.config.normal_button_font_size) editbox:SetShadowColor(0, 0, 0, 0) -- -- local button = CreateFrame('Button', nil, editbox, 'UIPanelButtonTemplate') diff --git a/info.lua b/info.lua index 9f99723..1b2c23c 100644 --- a/info.lua +++ b/info.lua @@ -200,20 +200,23 @@ function public.set_shopping_tooltip(slot) if index1 then ShoppingTooltip1:SetOwner(GameTooltip, 'ANCHOR_BOTTOMRIGHT') ShoppingTooltip1:SetInventoryItem('player', index1) - ShoppingTooltip1:SetAlpha(0) - Aux.control.on_next_update(function() - ShoppingTooltip1:SetPoint('TOPLEFT', GameTooltip, 'TOPRIGHT', 0, -10) - ShoppingTooltip1:SetAlpha(1) - end) + ShoppingTooltip1:SetPoint('TOPLEFT', GameTooltip, 'TOPRIGHT', 0, -10) + + -- for i = TOOLTIP_LENGTH-1,1,-1 do +-- for _, side in ipairs({'Left', 'Right'}) do +-- getglobal('ShoppingTooltip1Text'..side..(i + 1)):SetWidth(getglobal('ShoppingTooltip1Text'..side..i):GetWidth()) +-- getglobal('ShoppingTooltip1Text'..side..(i + 1)):SetText(getglobal('ShoppingTooltip1Text'..side..i):GetText()) +-- getglobal('ShoppingTooltip1Text'..side..(i + 1)):SetTextColor(getglobal('ShoppingTooltip1Text'..side..i):GetTextColor()) +-- end +-- end +-- +-- ShoppingTooltip1TextLeft1:SetText('Currently Equipped') +-- ShoppingTooltip1TextLeft1:SetTextColor(0.5, 0.5, 0.5) if index2 then ShoppingTooltip2:SetOwner(ShoppingTooltip1, 'ANCHOR_BOTTOMRIGHT') ShoppingTooltip2:SetInventoryItem('player', index2) - ShoppingTooltip2:SetAlpha(0) - Aux.control.on_next_update(function() - ShoppingTooltip2:SetPoint('TOPLEFT', ShoppingTooltip1, 'TOPRIGHT') - ShoppingTooltip2:SetAlpha(1) - end) + ShoppingTooltip2:SetPoint('TOPLEFT', ShoppingTooltip1, 'TOPRIGHT') end end end