diff options
Diffstat (limited to 'src/Config.cpp')
-rw-r--r-- | src/Config.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/Config.cpp b/src/Config.cpp index 159836f..7f71f21 100644 --- a/src/Config.cpp +++ b/src/Config.cpp @@ -22,8 +22,11 @@ namespace QuickMedia { } char *dpi = XGetDefault(display, "Xft", "dpi"); - if(dpi) + if(dpi) { xft_dpi = strtol(dpi, nullptr, 10); + if(xft_dpi == 0) + xft_dpi = XFT_DPI_DEFAULT; + } XCloseDisplay(display); return xft_dpi; @@ -37,12 +40,13 @@ namespace QuickMedia { if(gdk_scale) { setlocale(LC_ALL, "C"); // Sigh... stupid C scale = atof(gdk_scale); - if(scale < 0.0001f) - scale = 1.0f; } else { scale = (float)xrdb_get_dpi() / (float)XFT_DPI_DEFAULT; } + if(scale < 0.0001f) + scale = 1.0f; + scale_set = true; return scale; } @@ -148,6 +152,10 @@ namespace QuickMedia { const Json::Value &spacing_scale = json_root["spacing_scale"]; if(spacing_scale.isNumeric()) config->spacing_scale = spacing_scale.asFloat(); + + const Json::Value &local_manga_directory_json = json_root["local_manga_directory"]; + if(local_manga_directory_json.isString()) + config->local_manga_directory = local_manga_directory_json.asString(); } const Config& get_config() { |