Use fixed size for builtin menus on non-android platforms

diff --git a/builtin/mainmenu/init.lua b/builtin/mainmenu/init.lua
index dfaa04d3ccf1c6edf5bd5cb1b3184b82da212c93..d008ec8b0815b7f3c84be5aeac6d475c6d0bdd62 100644 (file)
--- 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 7f0ac049cdaa389f09d93d4c5db4ef0945bae78d..c4ad49fcf0a89b58a6b985dc2bd795965b5a429c 100644 (file)
--- 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,