diff options
Diffstat (limited to 'src/Text.cpp')
| -rw-r--r-- | src/Text.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/Text.cpp b/src/Text.cpp index 32aae2e..3cde45f 100644 --- a/src/Text.cpp +++ b/src/Text.cpp @@ -1,6 +1,7 @@ #include "../include/Text.hpp" #include "../include/ResourceLoader.hpp" #include "../include/Utils.hpp" +#include "../include/Theme.hpp" #include "../generated/Emoji.hpp" #include <SFML/Graphics/RectangleShape.hpp> #include <SFML/Window/Clipboard.hpp> @@ -14,7 +15,6 @@ namespace QuickMedia { static const float TAB_WIDTH = 4.0f; static const float WORD_WRAP_MIN_SIZE = 80.0f; - static const sf::Color URL_COLOR(35, 140, 245); static const size_t FONT_INDEX_LATIN = 0; static const size_t FONT_INDEX_CJK = 1; @@ -39,7 +39,7 @@ namespace QuickMedia bold_font(bold_font), characterSize(characterSize), maxWidth(maxWidth), - color(sf::Color::White), + color(get_current_theme().text_color), dirty(true), dirtyText(false), dirtyCaret(false), @@ -396,6 +396,8 @@ namespace QuickMedia float hspace = latin_font_height + characterSpacing; float vspace = latin_font->getLineSpacing(characterSize); // TODO: What about japanese font??? + const sf::Color url_color = get_current_theme().url_text_color; + size_t url_range_index = 0; sf::Vector2f glyphPos; @@ -455,7 +457,7 @@ namespace QuickMedia if(url_range_index < url_ranges.size()) { size_t string_offset = (textElement.text.data + i) - str.getData(); if(string_offset >= url_ranges[url_range_index].start && string_offset < url_ranges[url_range_index].start + url_ranges[url_range_index].length) { - text_color = URL_COLOR; + text_color = url_color; text_color.a = color.a; if(string_offset + 1 == url_ranges[url_range_index].start + url_ranges[url_range_index].length) ++url_range_index; |