diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-04-12 18:39:00 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-04-12 18:39:00 +0300 |
| commit | 351821c1f18f9285be58df0a05339936311f6490 (patch) | |
| tree | 47a60cad4f61f63c5ac2faf98dcae24760d7fe11 /src/gui/widgets/textbox.cpp | |
| parent | e50632a83a3c679cffd372656277a304d5d853f8 (diff) | |
| download | manaplus-351821c1f18f9285be58df0a05339936311f6490.tar.gz manaplus-351821c1f18f9285be58df0a05339936311f6490.tar.bz2 manaplus-351821c1f18f9285be58df0a05339936311f6490.tar.xz manaplus-351821c1f18f9285be58df0a05339936311f6490.zip | |
first part of style fixed after cpplint checks.
Diffstat (limited to 'src/gui/widgets/textbox.cpp')
| -rw-r--r-- | src/gui/widgets/textbox.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/widgets/textbox.cpp b/src/gui/widgets/textbox.cpp index dec73768e..b0281e9bd 100644 --- a/src/gui/widgets/textbox.cpp +++ b/src/gui/widgets/textbox.cpp @@ -53,7 +53,8 @@ void TextBox::setTextWrapped(const std::string &text, const int minDimension) if (getParent()) getParent()->logic(); - // Take the supplied minimum dimension as a starting point and try to beat it + // Take the supplied minimum dimension as a starting + // point and try to beat it mMinWidth = minDimension; std::stringstream wrappedStream; @@ -104,7 +105,7 @@ void TextBox::setTextWrapped(const std::string &text, const int minDimension) xpos = width; wrappedStream << word; } - else if (xpos != 0 && xpos + getFont()->getWidth(" ") + width <= + else if (xpos != 0 && xpos + getFont()->getWidth(" ") + width <= mMinWidth) { xpos += getFont()->getWidth(" ") + width; |