diff options
| author | Ira Rice <irarice@gmail.com> | 2009-04-17 10:50:34 -0600 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-04-20 20:37:27 +0200 |
| commit | 1658af139054adcc79f5571df14a3f60f26e2fa8 (patch) | |
| tree | 39ac237369e0252d4ab8483879be3ff341ddb9cd | |
| parent | b926bec4ff23e43729e88ea36c3cba9509b66f7c (diff) | |
| download | mana-1658af139054adcc79f5571df14a3f60f26e2fa8.tar.gz mana-1658af139054adcc79f5571df14a3f60f26e2fa8.tar.bz2 mana-1658af139054adcc79f5571df14a3f60f26e2fa8.tar.xz mana-1658af139054adcc79f5571df14a3f60f26e2fa8.zip | |
Fixed speech bubbles not respecting the set palette text color.
Signed-off-by: Ira Rice <irarice@gmail.com>
Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
| -rw-r--r-- | src/gui/speechbubble.cpp | 2 | ||||
| -rw-r--r-- | src/gui/widgets/textbox.h | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/gui/speechbubble.cpp b/src/gui/speechbubble.cpp index e95e83ca..0cfa543c 100644 --- a/src/gui/speechbubble.cpp +++ b/src/gui/speechbubble.cpp @@ -66,7 +66,7 @@ void SpeechBubble::setText(const std::string &text, bool showName) if (text == mText && (mCaption->getWidth() <= mSpeechBox->getMinWidth())) return; - graphics->setColor(guiPalette->getColor(Palette::TEXT)); + mSpeechBox->setTextColor(&guiPalette->getColor(Palette::TEXT)); int width = mCaption->getWidth() + 2 * getPadding(); const int speechWidth = mSpeechBox->getMinWidth() + 2 * getPadding(); diff --git a/src/gui/widgets/textbox.h b/src/gui/widgets/textbox.h index 5884e11c..1894e741 100644 --- a/src/gui/widgets/textbox.h +++ b/src/gui/widgets/textbox.h @@ -40,9 +40,7 @@ class TextBox : public gcn::TextBox TextBox(); inline void setTextColor(const gcn::Color* color) - { - mTextColor = color; - } + { mTextColor = color; } /** * Sets the text after wrapping it to the current width of the widget. |