More on UITable and the Market.

This commit is contained in:
BeniS
2012-07-22 05:17:03 +12:00
parent 9c8134c8a6
commit 76c7bf45bd
4 changed files with 57 additions and 31 deletions

View File

@@ -256,23 +256,23 @@ function Market.updateOffers(offers)
for k, offer in pairs(offers) do
if offer and offer:getAction() == MarketAction.Buy then
local data = {
offer:getPlayer(),
offer:getAmount(),
offer:getPrice()*offer:getAmount(),
offer:getPrice(),
offer:getTimeStamp()
{offer:getPlayer(), 80},
{offer:getAmount(), 50},
{offer:getPrice()*offer:getAmount(), 80},
{offer:getPrice(), 60},
{offer:getTimeStamp(), 80}
}
local row = buyOfferTable:addRow(data, 'OfferTableRow', 'OfferTableColumn')
local row = buyOfferTable:addRow(data)
table.insert(marketOffers[MarketAction.Buy], offer)
else
local data = {
offer:getPlayer(),
offer:getAmount(),
offer:getPrice()*offer:getAmount(),
offer:getPrice(),
offer:getTimeStamp()
{offer:getPlayer(), 80},
{offer:getAmount(), 50},
{offer:getPrice()*offer:getAmount(), 80},
{offer:getPrice(), 60},
{offer:getTimeStamp(), 80}
}
local row = sellOfferTable:addRow(data, 'OfferTableRow', 'OfferTableColumn')
local row = sellOfferTable:addRow(data)
table.insert(marketOffers[MarketAction.Sell], offer)
end
end
@@ -323,7 +323,10 @@ function Market.onMarketEnter(depotItems, offers, balance)
loadDepotItems(depotItems)
-- TODO: if you are already viewing an item on market enter it must recheck the current item
if selectedItem and selectedItem:isChecked() then
print(selectedItem)
print(selectedItem:isChecked())
if selectedItem then
print('in')
selectedItem:setChecked(false)
selectedItem:setChecked(true)
end

View File

@@ -4,7 +4,7 @@ OfferTableRow < TableRow
text-offset: 2 0
focusable: true
color: #cccccc
height: 25
height: 15
$focus:
background-color: #294f6d
@@ -51,6 +51,8 @@ Panel
border-width: 1
border-color: #191f27
vertical-scrollbar: sellingTableScrollBar
row-style: OfferTableRow
column-style: OfferTableColumn
VerticalScrollBar
id: sellingTableScrollBar
@@ -91,6 +93,8 @@ Panel
border-width: 1
border-color: #191f27
vertical-scrollbar: buyingTableScrollBar
row-style: OfferTableRow
column-style: OfferTableColumn
VerticalScrollBar
id: buyingTableScrollBar