diff options
author | Andrei Karas <akaras@inbox.ru> | 2012-09-28 23:43:54 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2012-09-28 23:43:54 +0300 |
commit | d7f2497abbc2be9ec2f8617232230d5328b1046d (patch) | |
tree | 6dc56d8444710121e54b619bb506af951076328b /src/gui/widgets | |
parent | 436abf9f8cc33dfff1fe21b8ec5e61854facbd0c (diff) | |
download | manaplus-d7f2497abbc2be9ec2f8617232230d5328b1046d.tar.gz manaplus-d7f2497abbc2be9ec2f8617232230d5328b1046d.tar.bz2 manaplus-d7f2497abbc2be9ec2f8617232230d5328b1046d.tar.xz manaplus-d7f2497abbc2be9ec2f8617232230d5328b1046d.zip |
Fix textbox font color.
Diffstat (limited to 'src/gui/widgets')
-rw-r--r-- | src/gui/widgets/textbox.cpp | 4 | ||||
-rw-r--r-- | src/gui/widgets/textbox.h | 14 |
2 files changed, 2 insertions, 16 deletions
diff --git a/src/gui/widgets/textbox.cpp b/src/gui/widgets/textbox.cpp index 3254f9f28..8af080294 100644 --- a/src/gui/widgets/textbox.cpp +++ b/src/gui/widgets/textbox.cpp @@ -35,9 +35,9 @@ TextBox::TextBox() : gcn::TextBox(), - mMinWidth(getWidth()), - mTextColor(&Theme::getThemeColor(Theme::TEXTBOX)) + mMinWidth(getWidth()) { + mForegroundColor = Theme::getThemeColor(Theme::TEXTBOX); setOpaque(false); setFrameSize(0); } diff --git a/src/gui/widgets/textbox.h b/src/gui/widgets/textbox.h index 61cf6f665..36362e011 100644 --- a/src/gui/widgets/textbox.h +++ b/src/gui/widgets/textbox.h @@ -40,9 +40,6 @@ class TextBox final : public gcn::TextBox */ TextBox(); - inline void setTextColor(const gcn::Color *color) - { mTextColor = color; } - /** * Sets the text after wrapping it to the current width of the widget. */ @@ -54,21 +51,10 @@ class TextBox final : public gcn::TextBox int getMinWidth() const { return mMinWidth; } - /** - * Draws the text. - */ - inline void draw(gcn::Graphics *graphics) override - { - if (mTextColor) - mForegroundColor = *mTextColor; - gcn::TextBox::draw(graphics); - } - void keyPressed(gcn::KeyEvent& keyEvent) override; private: int mMinWidth; - const gcn::Color *mTextColor; }; #endif |