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

Android: fix TMPFolder path (#10052)

Browse Source
This commit is contained in:
Maksim 2020-06-20 12:06:30 +02:00 committed by GitHub
parent 57df895cf9
commit a2199bf622
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/defaultsettings.cpp
View File

@ -451,6 +451,7 @@ void set_default_settings(Settings *settings)
settings->setDefault("high_precision_fpu", "true"); settings->setDefault("high_precision_fpu", "true");
settings->setDefault("enable_console", "false"); settings->setDefault("enable_console", "false");
settings->setDefault("screen_dpi", "72");
// Altered settings for macOS // Altered settings for macOS
#if defined(__MACH__) && defined(__APPLE__) #if defined(__MACH__) && defined(__APPLE__)
@ -464,7 +465,7 @@ void set_default_settings(Settings *settings)
settings->setDefault("screen_h", "0"); settings->setDefault("screen_h", "0");
settings->setDefault("fullscreen", "true"); settings->setDefault("fullscreen", "true");
settings->setDefault("touchtarget", "true"); settings->setDefault("touchtarget", "true");
settings->setDefault("TMPFolder", porting::getDataPath("tmp" DIR_DELIM)); settings->setDefault("TMPFolder", porting::path_cache);
settings->setDefault("touchscreen_threshold","20"); settings->setDefault("touchscreen_threshold","20");
settings->setDefault("fixed_virtual_joystick", "false"); settings->setDefault("fixed_virtual_joystick", "false");
settings->setDefault("virtual_joystick_triggers_aux", "false"); settings->setDefault("virtual_joystick_triggers_aux", "false");
@ -486,8 +487,8 @@ void set_default_settings(Settings *settings)
settings->setDefault("curl_verify_cert","false"); settings->setDefault("curl_verify_cert","false");
// Apply settings according to screen size // Apply settings according to screen size
float x_inches = ((double) porting::getDisplaySize().X / float x_inches = (float) porting::getDisplaySize().X /
(160 * porting::getDisplayDensity())); (160.f * porting::getDisplayDensity());
if (x_inches < 3.7f) { if (x_inches < 3.7f) {
settings->setDefault("hud_scaling", "0.6"); settings->setDefault("hud_scaling", "0.6");
@ -503,8 +504,5 @@ void set_default_settings(Settings *settings)
settings->setDefault("mono_font_size", "14"); settings->setDefault("mono_font_size", "14");
} }
// Tablets >= 6.0 use non-Android defaults for these settings // Tablets >= 6.0 use non-Android defaults for these settings
#else
settings->setDefault("screen_dpi", "72");
#endif #endif
} }