diff --git a/modules/corelib/ui/uiscrollbar.lua b/modules/corelib/ui/uiscrollbar.lua index 3d317d84..de7bb7c9 100644 --- a/modules/corelib/ui/uiscrollbar.lua +++ b/modules/corelib/ui/uiscrollbar.lua @@ -55,9 +55,7 @@ local function updateValueDisplay(widget) if widget == nil then return end if widget:getShowValue() then - local valueLabel = widget:getChildById('valueLabel') - local symbol = widget:getSymbol() - valueLabel:setText(widget:getValue() .. (symbol or '')) + widget:setText(widget:getValue() .. (widget:getSymbol() or '')) end end @@ -224,6 +222,11 @@ function UIScrollBar:setOrientation(orientation) self.orientation = orientation end +function UIScrollBar:setText(text) + local valueLabel = self:getChildById('valueLabel') + valueLabel:setText(text) +end + function UIScrollBar:onGeometryChange() updateSlider(self) end diff --git a/modules/game_market/market.lua b/modules/game_market/market.lua index b4944af6..05d6b39f 100644 --- a/modules/game_market/market.lua +++ b/modules/game_market/market.lua @@ -1082,7 +1082,7 @@ function Market.onMarketEnter(depotItems, offers, balance, vocation) if player then information.player = player end - if vocation < 0 then + if vocation == -1 then if player then information.vocation = player:getVocation() end diff --git a/modules/game_market/ui/general/amountwindow.otui b/modules/game_market/ui/general/amountwindow.otui index c57dbce1..3dc99425 100644 --- a/modules/game_market/ui/general/amountwindow.otui +++ b/modules/game_market/ui/general/amountwindow.otui @@ -21,7 +21,6 @@ AmountWindow < MainWindow anchors.top: prev.top margin-left: 10 margin-top: -2 - focusable: false Button id: buttonCancel diff --git a/modules/gamelib/game.lua b/modules/gamelib/game.lua index 2607f786..1780a37c 100644 --- a/modules/gamelib/game.lua +++ b/modules/gamelib/game.lua @@ -34,9 +34,10 @@ end function g_game.getSupportedProtocols() return { - 810, 811, 840, 842, 850, 853, 854, 860, 861, 862, 870, - 910, 940, 944, 953, 954, 960, 961, - 963, 970, 971, 973 + 810, 811, 840, 842, 850, 853, 854, + 860, 861, 862, 870, 910, 940, 944, + 953, 954, 960, 961, 963, 970, 971, + 973 } end