Wuzzy
/
BlockColor-Engine
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use fixed size for builtin menus on non-android platforms

This commit is contained in:
Perttu Ahola 2015-02-18 11:45:23 +02:00
parent 49f84b76bc
commit 4d744cf87a
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/mainmenu/init.lua
View File

@ -139,7 +139,11 @@ local function init_globals()
tv_main:add(tab_credits) tv_main:add(tab_credits)
tv_main:set_global_event_handler(main_event_handler) tv_main:set_global_event_handler(main_event_handler)
tv_main:set_fixed_size(false) if PLATFORM ~= "Android" then
tv_main:set_fixed_size(true)
else
tv_main:set_fixed_size(false)
end
if not (PLATFORM == "Android") then if not (PLATFORM == "Android") then
tv_main:set_tab(core.setting_get("maintab_LAST")) tv_main:set_tab(core.setting_get("maintab_LAST"))

4
src/game.cpp
View File

@ -1043,7 +1043,11 @@ static inline void create_formspec_menu(GUIFormSpecMenu **cur_formspec,
} }
} }
#ifdef __ANDROID__
#define SIZE_TAG "size[11,5.5]" #define SIZE_TAG "size[11,5.5]"
#else
#define SIZE_TAG "size[11,5.5,true]" // Fixed size on desktop
#endif
static void show_chat_menu(GUIFormSpecMenu **cur_formspec, static void show_chat_menu(GUIFormSpecMenu **cur_formspec,
InventoryManager *invmgr, IGameDef *gamedef, InventoryManager *invmgr, IGameDef *gamedef,