diff options
| author | dec05eba <dec05eba@protonmail.com> | 2021-09-04 02:31:10 +0200 |
|---|---|---|
| committer | dec05eba <dec05eba@protonmail.com> | 2021-09-04 02:31:10 +0200 |
| commit | fa815c3eee27cdae69b2e765b03de62a13f6379d (patch) | |
| tree | 4244ae7b62e2c94d749f0b199dd620bdd251dad0 /src/ImageViewer.cpp | |
| parent | dd4573e05cdfa2d9b99ef7a49c99e27c201da3e9 (diff) | |
Make font sizes customizable with a config file, see example-config.json. Remove environment variables
Diffstat (limited to 'src/ImageViewer.cpp')
| -rw-r--r-- | src/ImageViewer.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ImageViewer.cpp b/src/ImageViewer.cpp index f60e796..9bc177d 100644 --- a/src/ImageViewer.cpp +++ b/src/ImageViewer.cpp @@ -4,7 +4,7 @@ #include "../include/SfmlFixes.hpp" #include "../include/ResourceLoader.hpp" #include "../include/Scale.hpp" -#include "../include/Utils.hpp" +#include "../include/Config.hpp" #include <cmath> #include <malloc.h> #include <SFML/Window/Event.hpp> @@ -37,7 +37,7 @@ namespace QuickMedia { chapter_cache_dir(chapter_cache_dir), focused_page(current_page), font(FontLoader::get_font(FontLoader::FontType::LATIN)), - page_text("", *FontLoader::get_font(FontLoader::FontType::LATIN), 14 * get_ui_scale() * get_font_scale()), + page_text("", *FontLoader::get_font(FontLoader::FontType::LATIN), 14 * get_config().scale * get_config().font_scale), fit_image_to_window(fit_image_to_window) { current_page = std::min(current_page, num_pages); @@ -135,7 +135,7 @@ namespace QuickMedia { msg = "Failed to load image for page " + page_str; } - sf::Text error_message(std::move(msg), *font, 30 * get_ui_scale() * get_font_scale()); + sf::Text error_message(std::move(msg), *font, 30 * get_config().scale * get_config().font_scale); auto text_bounds = error_message.getLocalBounds(); error_message.setFillColor(sf::Color::Black); sf::Vector2<double> render_pos_text(std::floor(window_size.x * 0.5 - text_bounds.width * 0.5), - text_bounds.height * 0.5 + scroll + offset_y); @@ -154,7 +154,7 @@ namespace QuickMedia { } else { std::string page_str = std::to_string(1 + page); - sf::Text error_message("Downloading page " + page_str, *font, 30 * get_ui_scale() * get_font_scale()); + sf::Text error_message("Downloading page " + page_str, *font, 30 * get_config().scale * get_config().font_scale); auto text_bounds = error_message.getLocalBounds(); error_message.setFillColor(sf::Color::Black); sf::Vector2<double> render_pos_text(std::floor(window_size.x * 0.5 - text_bounds.width * 0.5), - text_bounds.height * 0.5 + scroll + offset_y); |