diff options
| author | sapier <Sapier at GMX dot net> | 2014-06-14 11:22:09 +0200 |
|---|---|---|
| committer | sapier <Sapier at GMX dot net> | 2014-06-22 00:08:55 +0200 |
| commit | d4245e6cac58a57ad2498eee2c17e851f3292296 (patch) | |
| tree | 9e3988d50bf69aa1eaff97cfbedffe23f36a2b9b /src/defaultsettings.cpp | |
| parent | a0097c6bfab026d5655ef7a9ba127cb90a80798c (diff) | |
| download | minetest-d4245e6cac58a57ad2498eee2c17e851f3292296.tar.gz minetest-d4245e6cac58a57ad2498eee2c17e851f3292296.tar.bz2 minetest-d4245e6cac58a57ad2498eee2c17e851f3292296.zip | |
Support for scalable font and gui elements
Fix positioning of tabheader in order to be usable for scaling GUIs
WARNING: this changes position of current tabheaders, mods have to adjust!
Diffstat (limited to 'src/defaultsettings.cpp')
| -rw-r--r-- | src/defaultsettings.cpp | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index a2d0a4c41..d0e562866 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -21,6 +21,8 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "porting.h" #include "filesys.h" #include "config.h" +#include "constants.h" +#include "porting.h" void set_default_settings(Settings *settings) { @@ -164,13 +166,11 @@ void set_default_settings(Settings *settings) #if USE_FREETYPE settings->setDefault("freetype", "true"); settings->setDefault("font_path", porting::getDataPath("fonts" DIR_DELIM "liberationsans.ttf")); - settings->setDefault("font_size", "13"); settings->setDefault("font_shadow", "1"); settings->setDefault("font_shadow_alpha", "128"); settings->setDefault("mono_font_path", porting::getDataPath("fonts" DIR_DELIM "liberationmono.ttf")); - settings->setDefault("mono_font_size", "13"); settings->setDefault("fallback_font_path", porting::getDataPath("fonts" DIR_DELIM "DroidSansFallbackFull.ttf")); - settings->setDefault("fallback_font_size", "13"); + settings->setDefault("fallback_font_shadow", "1"); settings->setDefault("fallback_font_shadow_alpha", "128"); #else @@ -234,7 +234,7 @@ void set_default_settings(Settings *settings) settings->setDefault("emergequeue_limit_diskonly", "32"); settings->setDefault("emergequeue_limit_generate", "32"); settings->setDefault("num_emerge_threads", "1"); - + // physics stuff settings->setDefault("movement_acceleration_default", "3"); settings->setDefault("movement_acceleration_air", "2"); @@ -278,6 +278,22 @@ void set_default_settings(Settings *settings) settings->setDefault("language", ""); } +void late_init_default_settings(Settings* settings) +{ +#ifndef SERVER + std::stringstream fontsize; + fontsize << floor( + DEFAULT_FONT_SIZE * + porting::getDisplayDensity() * + settings->getFloat("gui_scaling") + ); + + settings->setDefault("font_size", fontsize.str()); + settings->setDefault("mono_font_size", fontsize.str()); + settings->setDefault("fallback_font_size", fontsize.str()); +#endif +} + void override_default_settings(Settings *settings, Settings *from) { std::vector<std::string> names = from->getNames(); |