diff options
Diffstat (limited to 'src/Text.cpp')
| -rw-r--r-- | src/Text.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/Text.cpp b/src/Text.cpp index fb1373c..2165037 100644 --- a/src/Text.cpp +++ b/src/Text.cpp @@ -24,9 +24,9 @@ namespace QuickMedia return -1; } - Text::Text(const sf::Font *_font, const sf::Font *_cjk_font) : Text("", _font, _cjk_font, 0, 0.0f, false) {} + Text::Text(const sf::Font *_font, const sf::Font *_cjk_font) : Text("", _font, _cjk_font, 0, 0.0f) {} - Text::Text(sf::String _str, const sf::Font *_font, const sf::Font *_cjk_font, unsigned int _characterSize, float _maxWidth, bool _plainText) : + Text::Text(sf::String _str, const sf::Font *_font, const sf::Font *_cjk_font, unsigned int _characterSize, float _maxWidth) : font(_font), cjk_font(_cjk_font), characterSize(_characterSize), @@ -36,7 +36,6 @@ namespace QuickMedia dirty(true), dirtyText(false), dirtyCaret(false), - plainText(_plainText), editable(false), visible(true), caretMoveDirection(CaretMoveDirection::NONE), @@ -69,6 +68,12 @@ namespace QuickMedia { return str; } + + void Text::appendText(sf::String str) { + this->str += std::move(str); + dirty = true; + dirtyText = true; + } void Text::setPosition(float x, float y) { @@ -86,6 +91,7 @@ namespace QuickMedia return position; } + // TODO: Instead of setting text to dirty, iterate vertices and change their positions void Text::setMaxWidth(float maxWidth) { if(std::abs(maxWidth - this->maxWidth) > 1.0f) @@ -151,11 +157,6 @@ namespace QuickMedia if(editable != this->editable) { this->editable = editable; - if(!plainText) - { - dirty = true; - dirtyText = true; - } dirtyCaret = true; } } |