summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/gui/widgets/textbox.cpp28
-rw-r--r--src/gui/widgets/textbox.h2
2 files changed, 16 insertions, 14 deletions
diff --git a/src/gui/widgets/textbox.cpp b/src/gui/widgets/textbox.cpp
index 386a89bad..c1bf84d85 100644
--- a/src/gui/widgets/textbox.cpp
+++ b/src/gui/widgets/textbox.cpp
@@ -57,12 +57,6 @@ void TextBox::setTextWrapped(const std::string &text, const int minDimension)
// point and try to beat it
mMinWidth = minDimension;
- std::stringstream wrappedStream;
- size_t newlinePos;
- size_t lastNewlinePos = 0;
- int minWidth = 0;
- int xpos;
-
size_t spacePos = text.rfind(" ", text.size());
if (spacePos != std::string::npos)
@@ -74,6 +68,12 @@ void TextBox::setTextWrapped(const std::string &text, const int minDimension)
mMinWidth = length;
}
+ std::stringstream wrappedStream;
+ size_t newlinePos;
+ size_t lastNewlinePos = 0;
+ int minWidth = 0;
+ int xpos;
+
do
{
// Determine next piece of string to wrap
@@ -86,6 +86,8 @@ void TextBox::setTextWrapped(const std::string &text, const int minDimension)
text.substr(lastNewlinePos, newlinePos - lastNewlinePos);
size_t lastSpacePos = 0;
xpos = 0;
+ gcn::Font *const font = getFont();
+ const int spaceWidth = font->getWidth(" ");
do
{
@@ -94,10 +96,10 @@ void TextBox::setTextWrapped(const std::string &text, const int minDimension)
if (spacePos == std::string::npos)
spacePos = line.size();
- std::string word =
+ const std::string word =
line.substr(lastSpacePos, spacePos - lastSpacePos);
- const int width = getFont()->getWidth(word);
+ const int width = font->getWidth(word);
if (xpos == 0 && width > mMinWidth)
{
@@ -105,10 +107,10 @@ 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 + spaceWidth + width <=
mMinWidth)
{
- xpos += getFont()->getWidth(" ") + width;
+ xpos += spaceWidth + width;
wrappedStream << " " << word;
}
else if (lastSpacePos == 0)
@@ -355,16 +357,16 @@ void TextBox::draw(gcn::Graphics* graphics)
graphics->fillRectangle(gcn::Rectangle(0, 0, getWidth(), getHeight()));
}
+ gcn::Font *const font = getFont();
if (isFocused() && isEditable())
{
- drawCaret(graphics, getFont()->getWidth(
+ drawCaret(graphics, font->getWidth(
mTextRows[mCaretRow].substr(0, mCaretColumn)),
- mCaretRow * getFont()->getHeight());
+ mCaretRow * font->getHeight());
}
static_cast<Graphics*>(graphics)->setColorAll(
mForegroundColor, mForegroundColor2);
- gcn::Font *const font = getFont();
const int fontHeight = font->getHeight();
for (size_t i = 0, sz = mTextRows.size(); i < sz; i++)
diff --git a/src/gui/widgets/textbox.h b/src/gui/widgets/textbox.h
index 669ae6515..aa23364a7 100644
--- a/src/gui/widgets/textbox.h
+++ b/src/gui/widgets/textbox.h
@@ -62,7 +62,7 @@ class TextBox final : public gcn::TextBox,
void keyPressed(gcn::KeyEvent& keyEvent) override;
- void draw(gcn::Graphics* graphics);
+ void draw(gcn::Graphics* graphics) override;
void setForegroundColor(const gcn::Color &color);