diff options
author | Ira Rice <irarice@gmail.com> | 2009-01-28 18:03:14 -0700 |
---|---|---|
committer | Ira Rice <irarice@gmail.com> | 2009-01-28 18:03:14 -0700 |
commit | 129245a8063f09775930b0ffff11f043c219c277 (patch) | |
tree | e7a1486251f149cfd14c3eb290f4113107427bee /src/gui/textbox.cpp | |
parent | 4418d3678337276070e6d46d8011ce052be388a5 (diff) | |
download | mana-129245a8063f09775930b0ffff11f043c219c277.tar.gz mana-129245a8063f09775930b0ffff11f043c219c277.tar.bz2 mana-129245a8063f09775930b0ffff11f043c219c277.tar.xz mana-129245a8063f09775930b0ffff11f043c219c277.zip |
Consolidated setMinWidth into textWrap, since all lines are dependant
upon knowing what dimension they have to wrap to or beat in order for
text wrapping to work. By adding this to be initiated at the same time
as the text wrapping is done, this should decrease visual artifacts
caused by not initializing it properly to begin with.
Also made the item popups compact to the minimum dimension.
Signed-off-by: Ira Rice <irarice@gmail.com>
Diffstat (limited to 'src/gui/textbox.cpp')
-rw-r--r-- | src/gui/textbox.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/gui/textbox.cpp b/src/gui/textbox.cpp index ee03c79d..fb5a39e6 100644 --- a/src/gui/textbox.cpp +++ b/src/gui/textbox.cpp @@ -31,9 +31,10 @@ TextBox::TextBox(): { setOpaque(false); setFrameSize(0); + mMinWidth = getWidth(); } -void TextBox::setTextWrapped(const std::string &text) +void TextBox::setTextWrapped(const std::string &text, int minDimension) { // Make sure parent scroll area sets width of this widget if (getParent()) @@ -41,6 +42,9 @@ void TextBox::setTextWrapped(const std::string &text) getParent()->logic(); } + // Take the supplied minimum dimension as a starting point and try to beat it + mMinWidth = minDimension; + std::stringstream wrappedStream; std::string::size_type newlinePos, lastNewlinePos = 0; int minWidth = 0; |