MultiCraft
/
MultiCraft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mobile: tune some default settings

master
MoNTE48 2021-08-19 14:42:02 +03:00
parent 02c91ac585
commit 915c1edb2f
1 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/defaultsettings.cpp
View File

@ -492,6 +492,8 @@ void set_default_settings(Settings *settings) {
#endif #endif
} }
std::string font_small = std::to_string(TTF_DEFAULT_FONT_SIZE - 1);
// Android Settings // Android Settings
#ifdef __ANDROID__ #ifdef __ANDROID__
// Switch to olges2 with shaders on powerful Android devices // Switch to olges2 with shaders on powerful Android devices
@ -511,27 +513,26 @@ void set_default_settings(Settings *settings) {
v2u32 window_size = porting::getWindowSize(); v2u32 window_size = porting::getWindowSize();
if (window_size.X > 0) { if (window_size.X > 0) {
float x_inches = window_size.X / float x_inches = window_size.X / (160.f * porting::getDisplayDensity());
(160.f * porting::getDisplayDensity());
if (x_inches <= 3.7) { if (x_inches <= 3.7) {
// small 4" phones // small 4" phones
g_settings->setFloat("hud_scaling", 0.55); settings->setDefault("hud_scaling", "0.55");
g_settings->setU16("font_size", TTF_DEFAULT_FONT_SIZE - 1); settings->setDefault("font_size", font_small);
g_settings->setFloat("mouse_sensitivity", 0.3); settings->setDefault("mouse_sensitivity", "0.3");
} else if (x_inches > 3.7 && x_inches <= 4.5) { } else if (x_inches > 3.7 && x_inches <= 4.5) {
// medium phones // medium phones
g_settings->setFloat("hud_scaling", 0.6); settings->setDefault("hud_scaling", "0.6");
g_settings->setU16("font_size", TTF_DEFAULT_FONT_SIZE - 1); settings->setDefault("font_size", font_small);
g_settings->setS16("selectionbox_width", 6); settings->setDefault("selectionbox_width", "6");
} else if (x_inches > 4.5 && x_inches <= 5.5) { } else if (x_inches > 4.5 && x_inches <= 5.5) {
// large 6" phones // large 6" phones
g_settings->setFloat("hud_scaling", 0.7); settings->setDefault("hud_scaling", "0.7");
g_settings->setFloat("mouse_sensitivity", 0.15); settings->setDefault("mouse_sensitivity", "0.15");
g_settings->setS16("selectionbox_width", 6); settings->setDefault("selectionbox_width", "6");
} else if (x_inches > 5.5 && x_inches <= 6.5) { } else if (x_inches > 5.5 && x_inches <= 6.5) {
// 7" tablets // 7" tablets
g_settings->setFloat("hud_scaling", 0.9); settings->setDefault("hud_scaling", "0.9");
g_settings->setS16("selectionbox_width", 6); settings->setDefault("selectionbox_width", "6");
} }
} }
#endif // Android #endif // Android
@ -559,14 +560,17 @@ void set_default_settings(Settings *settings) {
// 4" iPhone and iPod Touch // 4" iPhone and iPod Touch
settings->setDefault("hud_scaling", "0.55"); settings->setDefault("hud_scaling", "0.55");
settings->setDefault("mouse_sensitivity", "0.33"); settings->setDefault("mouse_sensitivity", "0.33");
settings->setDefault("font_size", font_small);
} else if SDVersion4and7Inch { } else if SDVersion4and7Inch {
// 4.7" iPhone // 4.7" iPhone
settings->setDefault("hud_scaling", "0.65"); settings->setDefault("hud_scaling", "0.6");
settings->setDefault("mouse_sensitivity", "0.27"); settings->setDefault("mouse_sensitivity", "0.27");
settings->setDefault("font_size", font_small);
} else if SDVersion5and5Inch { } else if SDVersion5and5Inch {
// 5.5" iPhone Plus // 5.5" iPhone Plus
settings->setDefault("hud_scaling", "0.7"); settings->setDefault("hud_scaling", "0.65");
settings->setDefault("mouse_sensitivity", "0.3"); settings->setDefault("mouse_sensitivity", "0.3");
settings->setDefault("font_size", font_small);
} else if (SDVersion5and8Inch || SDVersion6and1Inch || SDVersion6and5Inch) { } else if (SDVersion5and8Inch || SDVersion6and1Inch || SDVersion6and5Inch) {
// 5.8+" iPhones // 5.8+" iPhones
settings->setDefault("hud_scaling", "0.85"); settings->setDefault("hud_scaling", "0.85");
@ -584,17 +588,14 @@ void set_default_settings(Settings *settings) {
} }
// Settings for the Rounded Screen and Home Bar // Settings for the Rounded Screen and Home Bar
if (@available(iOS 11, *)) { UIWindow *window = UIApplication.sharedApplication.windows.firstObject;
UIWindow *window = UIApplication.sharedApplication.windows.firstObject;
int bottomPadding = (int) window.safeAreaInsets.bottom;
if (bottomPadding > 0) { if (window.safeAreaInsets.bottom > 0) {
settings->setDefault("hud_move_upwards", "20"); settings->setDefault("hud_move_upwards", "20");
if (SDVersioniPhone12Series) if (SDVersioniPhone12Series)
settings->setDefault("round_screen", "75"); settings->setDefault("round_screen", "75");
else else
settings->setDefault("round_screen", "35"); settings->setDefault("round_screen", "35");
}
} }
#endif // iOS #endif // iOS
#endif #endif