BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Update gamebar on tab enter (#8192)

Browse Source
This commit is contained in:
Paul Ouellette 2019-02-18 16:04:43 -05:00 committed by Paramat
parent 57517628f0
commit 0ad96cc73f
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
builtin/mainmenu/init.lua
View File

@ -144,7 +144,10 @@ local function init_globals()
tv_main:set_fixed_size(false) tv_main:set_fixed_size(false)
if menustyle ~= "simple" then if menustyle ~= "simple" then
tv_main:set_tab(core.settings:get("maintab_LAST")) local last_tab = core.settings:get("maintab_LAST")
if last_tab and tv_main.current_tab ~= last_tab then
tv_main:set_tab(last_tab)
end
end end
ui.set_default("maintab") ui.set_default("maintab")
tv_main:show() tv_main:show()

16
builtin/mainmenu/tab_local.lua
View File

@ -294,13 +294,6 @@ end
local on_change local on_change
if enable_gamebar then if enable_gamebar then
function on_change(type, old_tab, new_tab) function on_change(type, old_tab, new_tab)
local buttonbar = ui.find_by_name("game_button_bar")
if ( buttonbar == nil ) then
singleplayer_refresh_gamebar()
buttonbar = ui.find_by_name("game_button_bar")
end
if (type == "ENTER") then if (type == "ENTER") then
local game = current_game() local game = current_game()
@ -309,10 +302,15 @@ if enable_gamebar then
core.set_topleft_text(game.name) core.set_topleft_text(game.name)
mm_texture.update("singleplayer",game) mm_texture.update("singleplayer",game)
end end
buttonbar:show()
singleplayer_refresh_gamebar()
ui.find_by_name("game_button_bar"):show()
else else
menudata.worldlist:set_filtercriteria(nil) menudata.worldlist:set_filtercriteria(nil)
buttonbar:hide() local gamebar = ui.find_by_name("game_button_bar")
if gamebar then
gamebar:hide()
end
core.set_topleft_text("") core.set_topleft_text("")
mm_texture.update(new_tab,nil) mm_texture.update(new_tab,nil)
end end