diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-05-06 01:08:57 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-05-06 01:08:57 +0300 |
| commit | 0ea8c99f68bf6af25776914af324cb1c7632bc54 (patch) | |
| tree | b4528c16b9018c5f5caf9c7c89888e79e132acdd | |
| parent | 55924e43101deef978c6f73ed5a4da63fcb58705 (diff) | |
| download | mv-0ea8c99f68bf6af25776914af324cb1c7632bc54.tar.gz mv-0ea8c99f68bf6af25776914af324cb1c7632bc54.tar.bz2 mv-0ea8c99f68bf6af25776914af324cb1c7632bc54.tar.xz mv-0ea8c99f68bf6af25776914af324cb1c7632bc54.zip | |
add outline color in checbox class.
| -rw-r--r-- | src/gui/theme.cpp | 1 | ||||
| -rw-r--r-- | src/gui/theme.h | 1 | ||||
| -rw-r--r-- | src/gui/widgets/checkbox.cpp | 4 | ||||
| -rw-r--r-- | src/gui/widgets/checkbox.h | 1 |
4 files changed, 6 insertions, 1 deletions
diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp index e4f78efd2..0babc9dbb 100644 --- a/src/gui/theme.cpp +++ b/src/gui/theme.cpp @@ -789,6 +789,7 @@ static int readColorType(const std::string &type) "BUTTON_PRESSED", "BUTTON_PRESSED_OUTLINE", "CHECKBOX", + "CHECKBOX_OUTLINE", "DROPDOWN", "LABEL", "LABEL_OUTLINE", diff --git a/src/gui/theme.h b/src/gui/theme.h index 579c34b8a..c56315355 100644 --- a/src/gui/theme.h +++ b/src/gui/theme.h @@ -229,6 +229,7 @@ class Theme final : public Palette, public ConfigListener BUTTON_PRESSED, BUTTON_PRESSED_OUTLINE, CHECKBOX, + CHECKBOX_OUTLINE, DROPDOWN, LABEL, LABEL_OUTLINE, diff --git a/src/gui/widgets/checkbox.cpp b/src/gui/widgets/checkbox.cpp index 63e73569f..552eb98fb 100644 --- a/src/gui/widgets/checkbox.cpp +++ b/src/gui/widgets/checkbox.cpp @@ -68,6 +68,7 @@ CheckBox::CheckBox(const Widget2 *const widget, addActionListener(listener); mForegroundColor = getThemeColor(Theme::CHECKBOX); + mForegroundColor2 = getThemeColor(Theme::CHECKBOX_OUTLINE); if (mSkin) { mPadding = mSkin->getPadding(); @@ -98,7 +99,8 @@ void CheckBox::draw(gcn::Graphics* graphics) drawBox(graphics); gcn::Font *const font = getFont(); - graphics->setColor(mForegroundColor); + static_cast<Graphics *const>(graphics)->setColorAll( + mForegroundColor, mForegroundColor2); font->drawString(graphics, mCaption, mPadding + mImageSize + mSpacing, mPadding); diff --git a/src/gui/widgets/checkbox.h b/src/gui/widgets/checkbox.h index 626d1ebe3..c6701f52a 100644 --- a/src/gui/widgets/checkbox.h +++ b/src/gui/widgets/checkbox.h @@ -91,6 +91,7 @@ class CheckBox final : public gcn::CheckBox, int mImagePadding; int mImageSize; int mSpacing; + gcn::Color mForegroundColor; static int instances; static Skin *mSkin; |