Commit ce8aa805 authored by TOM_RUS's avatar TOM_RUS

WOW-32218patch8.3.0_PTR

parent c2f4a78f
......@@ -1013,6 +1013,7 @@ local AuctionHouse =
Payload =
{
{ Name = "itemKey", Type = "ItemKey", Nilable = false },
{ Name = "newAuctionID", Type = "number", Nilable = true },
},
},
{
......
......@@ -338,6 +338,7 @@ do -- Miscellaneous
miscellaneousCategory:CreateSubCategoryAndFilter(LE_ITEM_CLASS_MISCELLANEOUS, LE_ITEM_MISCELLANEOUS_HOLIDAY);
miscellaneousCategory:CreateSubCategoryAndFilter(LE_ITEM_CLASS_MISCELLANEOUS, LE_ITEM_MISCELLANEOUS_OTHER);
miscellaneousCategory:CreateSubCategoryAndFilter(LE_ITEM_CLASS_MISCELLANEOUS, LE_ITEM_MISCELLANEOUS_MOUNT);
miscellaneousCategory:CreateSubCategoryAndFilter(LE_ITEM_CLASS_MISCELLANEOUS, LE_ITEM_MISCELLANEOUS_MOUNT_EQUIPMENT);
end
do -- WoW Token
......
......@@ -202,6 +202,7 @@ function AuctionHouseAuctionsFrameMixin:OnEvent(event, ...)
if event == "OWNED_AUCTIONS_UPDATED" then
self.AllAuctionsList:Reset();
self.SummaryList:RefreshScrollFrame();
self:ValidateDisplayMode();
elseif event == "OWNED_AUCTION_ADDED" then
local ownedAuctionID = ...;
......@@ -223,6 +224,7 @@ function AuctionHouseAuctionsFrameMixin:OnEvent(event, ...)
if self:IsDisplayingBids() then
self.SummaryList:RefreshScrollFrame();
self:ValidateDisplayMode();
end
elseif event == "BID_ADDED" then
......@@ -252,6 +254,9 @@ function AuctionHouseAuctionsFrameMixin:InitializeAllAuctionsList()
self:OnAllAuctionsSearchResultSelected(searchResult);
end);
self.AllAuctionsList:SetLineOnEnterCallback(AuctionHouseUtil.LineOnEnterCallback);
self.AllAuctionsList:SetLineOnLeaveCallback(GameTooltip_Hide);
self.AllAuctionsList:SetHighlightCallback(function(currentRowData, selectedRowData)
return selectedRowData and currentRowData.auctionID == selectedRowData.auctionID;
end);
......@@ -280,6 +285,9 @@ function AuctionHouseAuctionsFrameMixin:InitializeBidsList()
self:OnBidsListSearchResultSelected(searchResult);
end);
self.BidsList:SetLineOnEnterCallback(AuctionHouseUtil.LineOnEnterCallback);
self.BidsList:SetLineOnLeaveCallback(GameTooltip_Hide);
self.BidsList:SetHighlightCallback(function(currentRowData, selectedRowData)
return selectedRowData and currentRowData.auctionID == selectedRowData.auctionID;
end);
......@@ -392,6 +400,23 @@ function AuctionHouseAuctionsFrameMixin:SetDisplayMode(displayMode)
self.ItemDisplay:SetShown(not isAllAuctions and not isBidsList);
end
function AuctionHouseAuctionsFrameMixin:ValidateDisplayMode()
local displayMode = self.displayMode;
if displayMode == AuctionsFrameDisplayMode.Item or displayMode == AuctionsFrameDisplayMode.Commodity then
local itemKey = self:GetItemKey();
if self:IsDisplayingBids() then
if not AuctionHouseUtil.HasBidType(itemKey) then
self.SummaryList:SetSelectedListIndex(1);
end
else
if not AuctionHouseUtil.HasOwnedAuctionType(itemKey) then
self.SummaryList:SetSelectedListIndex(1);
end
end
end
end
function AuctionHouseAuctionsFrameMixin:GetDisplayMode()
return self.displayMode;
end
......
......@@ -30,13 +30,7 @@ function AuctionHouseBrowseResultsFrameMixin:OnLoad()
self:OnBrowseResultSelected(browseResult);
end);
self.ItemList:SetLineOnEnterCallback(function(line, rowData)
if rowData.itemKey then
GameTooltip:SetOwner(line, "ANCHOR_RIGHT");
GameTooltip:SetItemKey(rowData.itemKey.itemID, rowData.itemKey.itemLevel, rowData.itemKey.itemSuffix);
GameTooltip:Show();
end
end);
self.ItemList:SetLineOnEnterCallback(AuctionHouseUtil.LineOnEnterCallback);
self.ItemList:SetLineOnLeaveCallback(GameTooltip_Hide);
......
......@@ -49,14 +49,14 @@
</Scripts>
</Button>
<Frame name="AuctionHouseBuyDialogTemplate" mixin="AuctionHouseBuyDialogMixin" frameLevel="500" virtual="true">
<Frame name="AuctionHouseBuyDialogTemplate" mixin="AuctionHouseBuyDialogMixin" frameLevel="1000" virtual="true">
<Size x="420" y="0"/>
<Frames>
<Frame parentKey="Border" inherits="DialogBorderDarkTemplate" useParentLevel="true"/>
<Button parentKey="DialogOverlay" useParentLevel="true">
<Anchors>
<Anchor point="TOPLEFT" relativeKey="$parent.$parent" relativePoint="TOPLEFT"/>
<Anchor point="TOPLEFT" relativeKey="$parent.$parent" relativePoint="TOPLEFT" x="0" y="-22"/>
<Anchor point="BOTTOMRIGHT" relativeKey="$parent.$parent" relativePoint="BOTTOMRIGHT"/>
</Anchors>
</Button>
......
......@@ -92,7 +92,7 @@ function AuctionFrameFilters_AddSubSubCategories(categoriesList, subSubCategorie
end
function FilterButton_SetUp(button, info)
local normalText = button.NormalText;
local normalText = button.Text;
local normalTexture = button.NormalTexture;
local line = button.Lines;
......@@ -161,10 +161,14 @@ function FilterButton_SetUp(button, info)
end
function AuctionFrameFilter_OnEnter(self)
TruncatedTooltipScript_OnEnter(self);
self.HighlightTexture:Show();
end
function AuctionFrameFilter_OnLeave(self)
TruncatedTooltipScript_OnLeave(self);
self.HighlightTexture:Hide();
end
......
......@@ -2,7 +2,7 @@
..\..\FrameXML\UI.xsd">
<Script file="Blizzard_AuctionHouseCategoriesList.lua"/>
<Button name="AuctionCategoryButtonTemplate" parentArray="FilterButtons" virtual="true">
<Button name="AuctionCategoryButtonTemplate" parentArray="FilterButtons" inherits="TruncatedTooltipScriptTemplate" virtual="true">
<Size x="132" y="21"/>
<Layers>
<Layer level="BACKGROUND">
......@@ -39,11 +39,11 @@
<OnLeave function="AuctionFrameFilter_OnLeave"/>
<OnClick function="AuctionFrameFilter_OnClick"/>
</Scripts>
<ButtonText parentKey="NormalText" justifyH="LEFT">
<ButtonText parentKey="Text" justifyH="LEFT">
<Size x="0" y="8"/>
<Anchors>
<Anchor point="LEFT" x="4" y="0"/>
<Anchor point="RIGHT"/>
<Anchor point="RIGHT" x="-4" y="0"/>
</Anchors>
<Shadow>
<Offset>
......
......@@ -275,8 +275,6 @@ function AuctionHouseFrameMixin:OnLoad()
end
self:RegisterEvent("ADDON_LOADED");
self.CloseButton:SetFrameLevel(1500);
PanelTemplates_SetNumTabs(self, #self.Tabs);
......@@ -344,7 +342,10 @@ function AuctionHouseFrameMixin:OnHide()
self.BrowseResultsFrame:Reset();
self:ClearPostItem();
self.WoWTokenSellFrame:SetItem(nil);
self.CommoditiesSellFrame:SetItem(nil);
self.CommoditiesSellList:SetItemID(nil);
self.ItemSellFrame:SetItem(nil);
CloseAuctionHouse();
......
......@@ -9,7 +9,7 @@
</Anchors>
<Frames>
<!-- Base Frame -->
<Frame name="MerchantMoneyInset" inherits="InsetFrameTemplate" useParentLevel="true">
<Frame parentKey="MoneyFrameInset" inherits="InsetFrameTemplate" useParentLevel="true">
<Anchors>
<Anchor point="TOPLEFT" relativePoint="BOTTOMLEFT" x="2" y="27"/>
<Anchor point="BOTTOMRIGHT" relativePoint="BOTTOMLEFT" x="167" y="3"/>
......
......@@ -8,7 +8,6 @@ local AUCTION_HOUSE_ITEM_BUY_FRAME_EVENTS = {
"ITEM_SEARCH_RESULTS_UPDATED",
"ITEM_SEARCH_RESULTS_ADDED",
"BIDS_UPDATED",
"AUCTION_CANCELED",
"AUCTION_HOUSE_BROWSE_RESULTS_UPDATED",
};
......@@ -27,14 +26,7 @@ function AuctionHouseItemBuyFrameMixin:OnLoad()
end);
self.ItemList:SetHighlightCallback(function(currentRowData, selectedRowData)
if self.selectedAuctionCanceled then
if selectedRowData.buyoutAmount == currentRowData.buyoutAmount then
self.ItemList:SetSelectedEntry(currentRowData);
return true;
end
else
return selectedRowData and (currentRowData.auctionID == selectedRowData.auctionID);
end
return selectedRowData and (currentRowData.auctionID == selectedRowData.auctionID);
end);
self.ItemList:SetLineOnEnterCallback(AuctionHouseUtil.SetAuctionHouseTooltip);
......@@ -66,17 +58,22 @@ end
function AuctionHouseItemBuyFrameMixin:OnEvent(event, ...)
if event == "ITEM_SEARCH_RESULTS_UPDATED" then
self.ItemList:DirtyScrollFrame();
local itemKey, auctionID = ...;
if auctionID then
local function FindSelectedAuctionInfo(rowData)
return rowData.auctionID == auctionID;
end
local scrollTo = true;
self.ItemList:SetSelectedEntryByCondition(FindSelectedAuctionInfo, scrollTo);
else
self.ItemList:DirtyScrollFrame();
end
elseif event == "ITEM_SEARCH_RESULTS_ADDED" then
self.ItemList:DirtyScrollFrame();
elseif event == "BIDS_UPDATED" then
self.ItemList:DirtyScrollFrame();
elseif event == "AUCTION_CANCELED" then
local auctionID = ...;
local selectedRowData = self.ItemList:GetSelectedEntry();
if selectedRowData and selectedRowData.auctionID == auctionID then
self.selectedAuctionCanceled = true;
end
elseif event == "AUCTION_HOUSE_BROWSE_RESULTS_UPDATED" then
self.ItemList:UpdateRefreshFrame();
end
......@@ -117,8 +114,6 @@ function AuctionHouseItemBuyFrameMixin:SetItemKey(itemKey)
end
function AuctionHouseItemBuyFrameMixin:OnAuctionSelected(auctionData)
self.selectedAuctionCanceled = false;
if auctionData == nil then
self:ResetPrice();
else
......
......@@ -249,6 +249,37 @@ function AuctionHouseItemListMixin:SetState(state)
end
end
function AuctionHouseItemListMixin:SetSelectedEntryByCondition(condition, scrollTo)
if not self.getNumEntries then
return;
end
local numEntries = self.getNumEntries();
for i = 1, numEntries do
local rowData = self.getEntry(i);
if condition(rowData) then
self:SetSelectedEntry(rowData);
self:ScrollToEntryIndex(i);
return;
end
end
self:SetSelectedEntry(nil);
self:RefreshScrollFrame();
end
function AuctionHouseItemListMixin:ScrollToEntryIndex(entryIndex)
local buttons = HybridScrollFrame_GetButtons(self.ScrollFrame);
local buttonHeight = buttons[1]:GetHeight();
local currentScrollOffset = self:GetScrollOffset();
local newScrollOffset = entryIndex - 1;
if newScrollOffset < currentScrollOffset or newScrollOffset > (currentScrollOffset + #buttons) then
self.ScrollFrame.scrollBar:SetValue(newScrollOffset * buttonHeight);
else
self:RefreshScrollFrame();
end
end
function AuctionHouseItemListMixin:GetScrollOffset()
return HybridScrollFrame_GetOffset(self.ScrollFrame);
end
......
......@@ -15,6 +15,19 @@ function AuctionHouseBuyoutModeCheckButtonMixin:OnShow()
self:UpdateState();
end
function AuctionHouseBuyoutModeCheckButtonMixin:OnEnter()
GameTooltip:SetOwner(self, "ANCHOR_RIGHT");
local wrap = true;
GameTooltip_AddNormalLine(GameTooltip, AUCTION_HOUSE_BUYOUT_MODE_TOOLTIP, wrap);
GameTooltip:Show();
end
function AuctionHouseBuyoutModeCheckButtonMixin:OnLeave()
GameTooltip_Hide();
end
function AuctionHouseBuyoutModeCheckButtonMixin:OnClick()
self:UpdateState();
PlaySound(SOUNDKIT.IG_MAINMENU_OPTION_CHECKBOX_ON);
......@@ -192,6 +205,12 @@ function AuctionHouseItemSellFrameMixin:SetSecondaryPriceInputEnabled(enabled)
self.PriceInput:SetSubtext(enabled and AUCTION_HOUSE_BUYOUT_OPTIONAL_LABEL or nil);
self.PriceInput.PerItemPostfix:SetShown(not enabled);
self.SecondaryPriceInput:SetShown(enabled);
if not enabled then
self.SecondaryPriceInput:SetAmount(0);
end
self:UpdatePostState();
self:UpdateFocusTabbing();
self:MarkDirty();
end
......
......@@ -12,6 +12,8 @@
<Scripts>
<OnLoad method="OnLoad"/>
<OnShow method="OnShow"/>
<OnEnter method="OnEnter"/>
<OnLeave method="OnLeave"/>
<OnClick method="OnClick"/>
</Scripts>
</CheckButton>
......
......@@ -157,8 +157,7 @@ end
function AuctionHouseFilterButtonMixin:ToggleFilter(filter)
self.filters[filter] = not self.filters[filter];
local areFiltersDefault = tCompare(self.filters, DEFAULT_FILTERS);
self.ClearFiltersButton:SetShown(not areFiltersDefault);
self:GetParent():OnFilterToggled();
end
function AuctionHouseFilterButtonMixin:Reset()
......@@ -167,6 +166,10 @@ function AuctionHouseFilterButtonMixin:Reset()
self.ClearFiltersButton:Hide();
end
function AuctionHouseFilterButtonMixin:GetFilters()
return self.filters;
end
function AuctionHouseFilterButtonMixin:CalculateFiltersArray()
local filtersArray = {};
for key, value in pairs(self.filters) do
......@@ -182,6 +185,13 @@ function AuctionHouseFilterButtonMixin:GetLevelRange()
end
AuctionHouseLevelRangeEditBoxMixin = {};
function AuctionHouseLevelRangeEditBoxMixin:OnTextChanged()
self:GetParent():OnLevelRangeChanged();
end
AuctionHouseLevelRangeFrameMixin = {};
function AuctionHouseLevelRangeFrameMixin:OnLoad()
......@@ -189,6 +199,29 @@ function AuctionHouseLevelRangeFrameMixin:OnLoad()
self.MaxLevel.nextEditBox = self.MinLevel;
end
function AuctionHouseLevelRangeFrameMixin:OnHide()
self:FixLevelRange();
end
function AuctionHouseLevelRangeFrameMixin:SetLevelRangeChangedCallback(levelRangeChangedCallback)
self.levelRangeChangedCallback = levelRangeChangedCallback;
end
function AuctionHouseLevelRangeFrameMixin:OnLevelRangeChanged()
if self.levelRangeChangedCallback then
self.levelRangeChangedCallback();
end
end
function AuctionHouseLevelRangeFrameMixin:FixLevelRange()
local minLevel = self.MinLevel:GetNumber();
local maxLevel = self.MaxLevel:GetNumber();
if maxLevel ~= 0 and minLevel > maxLevel then
self.MinLevel:SetNumber(maxLevel);
end
end
function AuctionHouseLevelRangeFrameMixin:Reset()
self.MinLevel:SetText("");
self.MaxLevel:SetText("");
......@@ -224,11 +257,33 @@ end
AuctionHouseSearchBarMixin = CreateFromMixins(AuctionHouseSystemMixin);
function AuctionHouseSearchBarMixin:OnLoad()
local function LevelRangeChangedCallback()
self:OnLevelRangeChanged();
end
self.FilterButton.LevelRangeFrame:SetLevelRangeChangedCallback(LevelRangeChangedCallback)
end
function AuctionHouseSearchBarMixin:OnShow()
self.SearchBox:Reset();
self.FilterButton:Reset();
end
function AuctionHouseSearchBarMixin:OnFilterToggled()
self:UpdateClearFiltersButton();
end
function AuctionHouseSearchBarMixin:OnLevelRangeChanged()
self:UpdateClearFiltersButton();
end
function AuctionHouseSearchBarMixin:UpdateClearFiltersButton()
local areFiltersDefault = tCompare(self.FilterButton:GetFilters(), DEFAULT_FILTERS);
local minLevel, maxLevel = self.FilterButton:GetLevelRange();
self.FilterButton.ClearFiltersButton:SetShown(not areFiltersDefault or minLevel ~= 0 or maxLevel ~= 0);
end
function AuctionHouseSearchBarMixin:SetSearchText(searchText)
self.SearchBox:SetText(searchText);
end
......
......@@ -17,11 +17,17 @@
</Scripts>
</Button>
<EditBox name="AuctionHouseLevelRangeEditBoxTemplate" mixin="AuctionHouseLevelRangeEditBoxMixin" inherits="InputBoxTemplate" letters="3" numeric="true" autoFocus="false" virtual="true">
<Size x="28" y="16"/>
<Scripts>
<OnTextChanged method="OnTextChanged"/>
</Scripts>
</EditBox>
<Frame name="AuctionHouseLevelRangeFrameTemplate" mixin="AuctionHouseLevelRangeFrameMixin" inherits="UIDropDownCustomMenuEntryTemplate" virtual="true">
<Size x="80" y="22"/>
<Frames>
<EditBox parentKey="MinLevel" letters="3" numeric="true" autoFocus="false" inherits="InputBoxTemplate">
<Size x="28" y="16"/>
<EditBox parentKey="MinLevel" inherits="AuctionHouseLevelRangeEditBoxTemplate">
<Anchors>
<Anchor point="LEFT" x="8" y="0"/>
</Anchors>
......@@ -35,8 +41,7 @@
</Layer>
</Layers>
</EditBox>
<EditBox parentKey="MaxLevel" letters="3" numeric="true" autoFocus="false" inherits="InputBoxTemplate">
<Size x="28" y="16"/>
<EditBox parentKey="MaxLevel" inherits="AuctionHouseLevelRangeEditBoxTemplate">
<Anchors>
<Anchor point="LEFT" relativeKey="$parent.MinLevel" relativePoint="RIGHT" x="10" y="0"/>
</Anchors>
......@@ -44,10 +49,11 @@
</Frames>
<Scripts>
<OnLoad method="OnLoad"/>
<OnHide method="OnHide"/>
</Scripts>
</Frame>
<Button name="AuctionHouseFilterButtonTemplate" mixin="AuctionHouseFilterButtonMixin" inherits="UIMenuButtonStretchTemplate" registerForClicks="LeftButtonDown" text="FILTER" virtual="true">
<DropDownToggleButton name="AuctionHouseFilterButtonTemplate" mixin="AuctionHouseFilterButtonMixin" inherits="UIMenuButtonStretchTemplate" registerForClicks="LeftButtonDown" text="FILTER" virtual="true">
<Size x="93" y="22"/>
<Layers>
<Layer level="ARTWORK">
......@@ -79,7 +85,7 @@
<OnClick method="OnClick"/>
<OnLoad method="OnLoad"/>
</Scripts>
</Button>
</DropDownToggleButton>
<Frame name="AuctionHouseFilterDropDownMenuTemplate" mixin="AuctionHouseFilterDropDownMenuMixin" inherits="UIDropDownMenuTemplate" virtual="true">
<Size x="100" y="0"/>
......@@ -113,14 +119,15 @@
<Anchor point="RIGHT" relativeKey="$parent" relativePoint="RIGHT" x="0" y="0"/>
</Anchors>
</Button>
<Button parentKey="FilterButton" inherits="AuctionHouseFilterButtonTemplate">
<DropDownToggleButton parentKey="FilterButton" inherits="AuctionHouseFilterButtonTemplate">
<Size x="93" y="22"/>
<Anchors>
<Anchor point="RIGHT" relativeKey="$parent.SearchButton" relativePoint="LEFT" x="-10" y="0"/>
</Anchors>
</Button>
</DropDownToggleButton>
</Frames>
<Scripts>
<OnLoad method="OnLoad"/>
<OnShow method="OnShow"/>
</Scripts>
</Frame>
......
......@@ -280,6 +280,10 @@ function AuctionHouseSellFrameMixin:OnLoad()
return itemLocation == nil or C_AuctionHouse.IsSellItemValid(itemLocation);
end);
self.ItemDisplay.ItemButton.Highlight:ClearAllPoints();
self.ItemDisplay.ItemButton.Highlight:SetPoint("TOPLEFT", self.ItemDisplay.ItemButton, "TOPLEFT");
self.ItemDisplay.ItemButton.Highlight:SetPoint("BOTTOMRIGHT", self.ItemDisplay.ItemButton, "BOTTOMRIGHT");
self.QuantityInput:SetInputChangedCallback(function()
local maxQuantity = self:GetMaxQuantity();
if self.QuantityInput:GetQuantity() > maxQuantity then
......@@ -336,11 +340,8 @@ function AuctionHouseSellFrameMixin:UpdatePostState()
local price = self.PriceInput:GetAmount();
local searchResultPrice = self:GetSearchResultPrice();
if not self.helpTipShown and searchResultPrice and price == (searchResultPrice - COPPER_PER_SILVER) then
if searchResultPrice and price == (searchResultPrice - COPPER_PER_SILVER) then
self:ShowHelpTip();
-- TEMP: For Jeff's demo, always show the undercut message.
-- self.helpTipShown = true;
else
self:HideHelpTip();
end
......
......@@ -68,6 +68,39 @@ function AuctionHouseTableCellItemKeyMixin:UpdateDisplay(itemKey, itemKeyInfo)
end
AuctionHouseTableCellTextTooltipMixin = CreateFromMixins(AuctionHouseTableCellMixin);
function AuctionHouseTableCellTextTooltipMixin:UpdateText(newText)
self.Text:SetText(newText);
self:UpdateHitRect();
end
function AuctionHouseTableCellTextTooltipMixin:UpdateHitRect()
local hitRectInset = self:GetWidth() - self.Text:GetStringWidth();
if self.Text:GetJustifyH() == "LEFT" then
self:SetHitRectInsets(0, hitRectInset, 0, 0);
else
self:SetHitRectInsets(hitRectInset, 0, 0, 0);
end
end
function AuctionHouseTableCellTextTooltipMixin:OnEnter()
ExecuteFrameScript(self:GetParent(), "OnEnter");
self:ShowTooltip(GameTooltip);
end
function AuctionHouseTableCellTextTooltipMixin:OnLeave()
ExecuteFrameScript(self:GetParent(), "OnLeave");
GameTooltip_Hide();
end
function AuctionHouseTableCellItemKeyMixin:ShowTooltip(tooltip)
-- Implement in your derived mixin.
end
AuctionHouseTablePriceDisplayMixin = CreateFromMixins(AuctionHouseTableCellMixin);
function AuctionHouseTablePriceDisplayMixin:Init(owner)
......@@ -288,7 +321,7 @@ function AuctionHouseTableSocketDisplayMixin:Populate(rowData, dataIndex)
end
AuctionHouseTableCellOwnersMixin = CreateFromMixins(AuctionHouseTableCellMixin);
AuctionHouseTableCellOwnersMixin = CreateFromMixins(AuctionHouseTableCellTextTooltipMixin);
function AuctionHouseTableCellOwnersMixin:Init(owner)
AuctionHouseTableCellMixin.Init(self, owner);
......@@ -297,11 +330,20 @@ function AuctionHouseTableCellOwnersMixin:Init(owner)
end
function AuctionHouseTableCellOwnersMixin:Populate(rowData, dataIndex)
self.Text:SetText(AuctionHouseUtil.GetSellersString(rowData));
self:UpdateText(AuctionHouseUtil.GetSellersString(rowData));
end
function AuctionHouseTableCellOwnersMixin:ShowTooltip(tooltip)
local owners = self.rowData.owners;
if #owners > 1 then
tooltip:SetOwner(self:GetParent(), "ANCHOR_RIGHT");
AuctionHouseUtil.AddSellersToTooltip(tooltip, owners);
tooltip:Show();
end
end
AuctionHouseTableCellTimeLeftMixin = CreateFromMixins(AuctionHouseTableCellMixin);
AuctionHouseTableCellTimeLeftMixin = CreateFromMixins(AuctionHouseTableCellTextTooltipMixin);
function AuctionHouseTableCellTimeLeftMixin:Init(owner)
AuctionHouseTableCellMixin.Init(self, owner);
......@@ -314,7 +356,20 @@ function AuctionHouseTableCellTimeLeftMixin:Populate(rowData, dataIndex)
self.Text:SetShown(hasExplicitTimeLeft);
if hasExplicitTimeLeft then
self.Text:SetText(AuctionHouseUtil.FormatTimeLeft(rowData.timeLeftSeconds, rowData.status));
self:UpdateText(AuctionHouseUtil.FormatTimeLeft(rowData.timeLeftSeconds, rowData.status));
end
end