Minor fix to scroll bar

master
BeniS 11 years ago
parent 3b9acab7a1
commit b61094c053

@ -55,9 +55,7 @@ local function updateValueDisplay(widget)
if widget == nil then return end if widget == nil then return end
if widget:getShowValue() then if widget:getShowValue() then
local valueLabel = widget:getChildById('valueLabel') widget:setText(widget:getValue() .. (widget:getSymbol() or ''))
local symbol = widget:getSymbol()
valueLabel:setText(widget:getValue() .. (symbol or ''))
end end
end end
@ -224,6 +222,11 @@ function UIScrollBar:setOrientation(orientation)
self.orientation = orientation self.orientation = orientation
end end
function UIScrollBar:setText(text)
local valueLabel = self:getChildById('valueLabel')
valueLabel:setText(text)
end
function UIScrollBar:onGeometryChange() function UIScrollBar:onGeometryChange()
updateSlider(self) updateSlider(self)
end end

@ -1082,7 +1082,7 @@ function Market.onMarketEnter(depotItems, offers, balance, vocation)
if player then if player then
information.player = player information.player = player
end end
if vocation < 0 then if vocation == -1 then
if player then if player then
information.vocation = player:getVocation() information.vocation = player:getVocation()
end end

@ -21,7 +21,6 @@ AmountWindow < MainWindow
anchors.top: prev.top anchors.top: prev.top
margin-left: 10 margin-left: 10
margin-top: -2 margin-top: -2
focusable: false
Button Button
id: buttonCancel id: buttonCancel

@ -34,9 +34,10 @@ end
function g_game.getSupportedProtocols() function g_game.getSupportedProtocols()
return { return {
810, 811, 840, 842, 850, 853, 854, 860, 861, 862, 870, 810, 811, 840, 842, 850, 853, 854,
910, 940, 944, 953, 954, 960, 961, 860, 861, 862, 870, 910, 940, 944,
963, 970, 971, 973 953, 954, 960, 961, 963, 970, 971,
973
} }
end end

Loading…
Cancel
Save