From 4d744cf87ad1cd108d125c58559cef4316e80a70 Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Wed, 18 Feb 2015 11:45:23 +0200 Subject: [PATCH] Use fixed size for builtin menus on non-android platforms --- builtin/mainmenu/init.lua | 6 +++++- src/game.cpp | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/builtin/mainmenu/init.lua b/builtin/mainmenu/init.lua index dfaa04d3c..d008ec8b0 100644 --- a/builtin/mainmenu/init.lua +++ b/builtin/mainmenu/init.lua @@ -139,7 +139,11 @@ local function init_globals() tv_main:add(tab_credits) 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 tv_main:set_tab(core.setting_get("maintab_LAST")) diff --git a/src/game.cpp b/src/game.cpp index 7f0ac049c..c4ad49fcf 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -1043,7 +1043,11 @@ static inline void create_formspec_menu(GUIFormSpecMenu **cur_formspec, } } +#ifdef __ANDROID__ #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, InventoryManager *invmgr, IGameDef *gamedef,