From 1658af139054adcc79f5571df14a3f60f26e2fa8 Mon Sep 17 00:00:00 2001 From: Ira Rice Date: Fri, 17 Apr 2009 10:50:34 -0600 Subject: Fixed speech bubbles not respecting the set palette text color. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ira Rice Signed-off-by: Bjørn Lindeijer --- src/gui/speechbubble.cpp | 2 +- src/gui/widgets/textbox.h | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'src/gui') 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. -- cgit v1.2.3-70-g09d2