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

Mobile: try to fit 13 coordinates on large tablets

master
MoNTE48 2021-12-20 13:35:05 +01:00
parent 11a7f2a8a2
commit 671592fbaf
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/defaultsettings.cpp
View File

@ -381,6 +381,7 @@ void set_default_settings(Settings *settings) {
settings->setDefault("enable_console", "false"); settings->setDefault("enable_console", "false");
settings->setDefault("mainmenu_last_selected_world", "1"); settings->setDefault("mainmenu_last_selected_world", "1");
settings->setDefault("device_is_tablet", "false");
// Altered settings for macOS // Altered settings for macOS
#if defined(__MACH__) && defined(__APPLE__) && !defined(__IOS__) #if defined(__MACH__) && defined(__APPLE__) && !defined(__IOS__)
@ -534,6 +535,9 @@ void set_default_settings(Settings *settings) {
settings->setDefault("hud_scaling", "0.9"); settings->setDefault("hud_scaling", "0.9");
settings->setDefault("selectionbox_width", "6"); settings->setDefault("selectionbox_width", "6");
} }
if (x_inches >= 7.0)
settings->setDefault("device_is_tablet", "true");
} }
#endif // Android #endif // Android
@ -555,6 +559,9 @@ void set_default_settings(Settings *settings) {
settings->setDefault("mono_font_path", g_settings->get("font_path")); settings->setDefault("mono_font_path", g_settings->get("font_path"));
settings->setDefault("fallback_font_path", g_settings->get("font_path")); settings->setDefault("fallback_font_path", g_settings->get("font_path"));
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad)
settings->setDefault("device_is_tablet", "true");
// Set the size of the elements depending on the screen size // Set the size of the elements depending on the screen size
if SDVersion4Inch { if SDVersion4Inch {
// 4" iPhone and iPod Touch // 4" iPhone and iPod Touch
@ -581,6 +588,7 @@ void set_default_settings(Settings *settings) {
settings->setDefault("hud_scaling", "0.9"); settings->setDefault("hud_scaling", "0.9");
settings->setDefault("mouse_sensitivity", "0.25"); settings->setDefault("mouse_sensitivity", "0.25");
settings->setDefault("selectionbox_width", "6"); settings->setDefault("selectionbox_width", "6");
settings->setDefault("device_is_tablet", "false");
} else { } else {
// iPad // iPad
settings->setDefault("mouse_sensitivity", "0.3"); settings->setDefault("mouse_sensitivity", "0.3");

4
src/guiFormSpecMenu.cpp
View File

@ -2118,6 +2118,10 @@ void GUIFormSpecMenu::regenerateGui(v2u32 screensize)
// smaller screensize. // smaller screensize.
double prefer_imgsize = mydata.screensize.Y / 10 * gui_scaling; double prefer_imgsize = mydata.screensize.Y / 10 * gui_scaling;
// Try to fit 13 coordinates on large tablets.
if (g_settings->getBool("device_is_tablet"))
prefer_imgsize = padded_screensize.Y / 13 * gui_scaling;
fitx_imgsize = floor(mydata.screensize.X / fitx_imgsize = floor(mydata.screensize.X /
(1.5 * (0.5 + mydata.invsize.X))); (1.5 * (0.5 + mydata.invsize.X)));
fity_imgsize = floor(mydata.screensize.Y / fity_imgsize = floor(mydata.screensize.Y /