diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2015-02-18 11:45:23 +0200 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2015-02-18 13:57:54 +0200 |
| commit | bb603ff18ebc62fdd5799118eee318747f60744a (patch) | |
| tree | c8b4cc388e9a7c7375c285ca032d79ecda0243ad | |
| parent | 4208fdfd2273b715eeddb8b9877c2def8346d447 (diff) | |
| download | minetest-bb603ff18ebc62fdd5799118eee318747f60744a.tar.gz minetest-bb603ff18ebc62fdd5799118eee318747f60744a.tar.bz2 minetest-bb603ff18ebc62fdd5799118eee318747f60744a.zip | |
Use fixed size for builtin menus on non-android platforms
| -rw-r--r-- | builtin/mainmenu/init.lua | 6 | ||||
| -rw-r--r-- | src/game.cpp | 4 |
2 files changed, 9 insertions, 1 deletions
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 896973515..8e88fbc8f 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, |