From e75af79d1b30133e84679b63758aa24cfb754113 Mon Sep 17 00:00:00 2001 From: Looki2000 Date: Thu, 23 Feb 2023 00:02:10 +0100 Subject: [PATCH] reverted back to original font size as it was too large and went beyond the buttons and gui --- builtin/settingtypes.txt | 2 +- settings_modified_for_sussycraft.txt | 4 ---- src/defaultsettings.cpp | 6 +++--- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index 666ca38..fb661d8 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -1673,7 +1673,7 @@ font_shadow (Font shadow) int 1 0 65535 font_shadow_alpha (Font shadow alpha) int 127 0 255 # Font size of the default font where 1 unit = 1 pixel at 96 DPI -font_size (Font size) int 32 5 72 +font_size (Font size) int 16 5 72 # For pixel-style fonts that do not scale well, this ensures that font sizes used # with this font will always be divisible by this value, in pixels. For instance, diff --git a/settings_modified_for_sussycraft.txt b/settings_modified_for_sussycraft.txt index 0ce6da5..89694e4 100644 --- a/settings_modified_for_sussycraft.txt +++ b/settings_modified_for_sussycraft.txt @@ -2,7 +2,6 @@ settingtypes.txt: fps_max (Maximum FPS) int 4294967295 1 4294967295 vsync (VSync) bool true serverlist_url (Serverlist URL) string servers.cubesoftware.xyz <=== WARNING!! THERE ARE 2 THE SAME LINES FOR SOME REASON -font_size (Font size) int 32 5 72 font_path (Regular font path) filepath fonts/monogram-extended.ttf touchscreen_threshold (Touch screen threshold) int 5 0 100 mouse_sensitivity (Mouse sensitivity) float 0.1 0.001 10.0 @@ -13,9 +12,6 @@ settings->setDefault("smooth_lighting", "true"); // comment to be able to find t settings->setDefault("fps_max", "4294967295"); // fps is "unlimited" because vsync is on settings->setDefault("vsync", "true"); // comment to be able to find this line from settings_modified_for_sussycraft.txt settings->setDefault("serverlist_url", "servers.cubesoftware.xyz"); // comment to be able to find this line from settings_modified_for_sussycraft.txt -settings->setDefault("font_size", "32"); // comment to be able to find this line from settings_modified_for_sussycraft.txt (1) -settings->setDefault("font_size", "32"); // comment to be able to find this line from settings_modified_for_sussycraft.txt (2) -settings->setDefault("font_size", "32"); // comment to be able to find this line from settings_modified_for_sussycraft.txt (3) settings->setDefault("font_path", porting::getDataPath("fonts" DIR_DELIM "monogram-extended.ttf")); // comment to be able to find this line from settings_modified_for_sussycraft.txt settings->setDefault("touchscreen_threshold","5"); // comment to be able to find this line from settings_modified_for_sussycraft.txt settings->setDefault("menu_clouds", "false"); // comment to be able to find this line from settings_modified_for_sussycraft.txt diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index 8295422..8f6f8c6 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -502,15 +502,15 @@ void set_default_settings() if (x_inches < 3.7f) { settings->setDefault("hud_scaling", "0.6"); - settings->setDefault("font_size", "32"); // comment to be able to find this line from settings_modified_for_sussycraft.txt (1) + settings->setDefault("font_size", "14"); settings->setDefault("mono_font_size", "14"); } else if (x_inches < 4.5f) { settings->setDefault("hud_scaling", "0.7"); - settings->setDefault("font_size", "32"); // comment to be able to find this line from settings_modified_for_sussycraft.txt (2) + settings->setDefault("font_size", "14"); settings->setDefault("mono_font_size", "14"); } else if (x_inches < 6.0f) { settings->setDefault("hud_scaling", "0.85"); - settings->setDefault("font_size", "32"); // comment to be able to find this line from settings_modified_for_sussycraft.txt (3) + settings->setDefault("font_size", "14"); settings->setDefault("mono_font_size", "14"); } // Tablets >= 6.0 use non-Android defaults for these settings