Right mouse button behaviour for craft/inventory If right mousebutton clicked once...

[dragonfireclient.git] / src / defaultsettings.cpp

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 72eac76c23dd46804d1862a613d04fa95e541568..1ebf5dc49bc7dd34df1985ba391253abdea21246 100644 (file)
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -187,10 +187,23 @@ void set_default_settings(Settings *settings)
 
        settings->setDefault("fallback_font_shadow", "1");
        settings->setDefault("fallback_font_shadow_alpha", "128");
+
+       std::stringstream fontsize;
+       fontsize << TTF_DEFAULT_FONT_SIZE;
+
+       settings->setDefault("font_size", fontsize.str());
+       settings->setDefault("mono_font_size", fontsize.str());
+       settings->setDefault("fallback_font_size", fontsize.str());
 #else
        settings->setDefault("freetype", "false");
-       settings->setDefault("font_path", porting::getDataPath("fonts" DIR_DELIM "fontlucida.png"));
-       settings->setDefault("mono_font_path", porting::getDataPath("fonts" DIR_DELIM "fontdejavusansmono.png"));
+       settings->setDefault("font_path", porting::getDataPath("fonts" DIR_DELIM "lucida_sans"));
+       settings->setDefault("mono_font_path", porting::getDataPath("fonts" DIR_DELIM "mono_dejavu_sans"));
+
+       std::stringstream fontsize;
+       fontsize << DEFAULT_FONT_SIZE;
+
+       settings->setDefault("font_size", fontsize.str());
+       settings->setDefault("mono_font_size", fontsize.str());
 #endif
 
        // Server stuff
@@ -317,22 +330,8 @@ void set_default_settings(Settings *settings)
                settings->setDefault("gui_scaling", "0.7");
        }
        settings->setDefault("curl_verify_cert","false");
-#endif
-}
-
-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());
+#else
+       settings->setDefault("screen_dpi", "72");
 #endif
 }