summaryrefslogtreecommitdiff
path: root/src/gui/widgets
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-08-22 04:38:03 +0300
committerAndrei Karas <akaras@inbox.ru>2011-08-22 04:38:03 +0300
commit8257d7d35e0dd915512df06cafb810f4611be06a (patch)
tree7d4449df4e7b9e27bd1e069eb0132931dfd2a5f1 /src/gui/widgets
parentdddfb405de9d04f50d3a95cc3b0ebc3e49884a65 (diff)
downloadmanaverse-8257d7d35e0dd915512df06cafb810f4611be06a.tar.gz
manaverse-8257d7d35e0dd915512df06cafb810f4611be06a.tar.bz2
manaverse-8257d7d35e0dd915512df06cafb810f4611be06a.tar.xz
manaverse-8257d7d35e0dd915512df06cafb810f4611be06a.zip
Fix some theme font colors in different gui elements.
Add new color ITEM_NOT_EQUIPPED.
Diffstat (limited to 'src/gui/widgets')
-rw-r--r--src/gui/widgets/itemcontainer.cpp2
-rw-r--r--src/gui/widgets/label.cpp1
-rw-r--r--src/gui/widgets/radiobutton.cpp1
3 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index b79f26226..c2a5ec1b7 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -206,7 +206,7 @@ void ItemContainer::draw(gcn::Graphics *graphics)
if (item->isEquipped())
g->setColor(Theme::getThemeColor(Theme::ITEM_EQUIPPED));
else
- g->setColor(gcn::Color(0, 0, 0));
+ g->setColor(Theme::getThemeColor(Theme::ITEM_NOT_EQUIPPED));
g->drawText(caption, itemX + BOX_WIDTH / 2,
itemY + BOX_HEIGHT - 14, gcn::Graphics::CENTER);
diff --git a/src/gui/widgets/label.cpp b/src/gui/widgets/label.cpp
index 16b813dd5..67e8bd12b 100644
--- a/src/gui/widgets/label.cpp
+++ b/src/gui/widgets/label.cpp
@@ -26,6 +26,7 @@
Label::Label()
{
+ setForegroundColor(Theme::getThemeColor(Theme::TEXT));
}
Label::Label(const std::string &caption) :
diff --git a/src/gui/widgets/radiobutton.cpp b/src/gui/widgets/radiobutton.cpp
index a82ec3e8d..e641be323 100644
--- a/src/gui/widgets/radiobutton.cpp
+++ b/src/gui/widgets/radiobutton.cpp
@@ -46,6 +46,7 @@ RadioButton::RadioButton(const std::string &caption, const std::string &group,
gcn::RadioButton(caption, group, marked),
mHasMouse(false)
{
+ setForegroundColor(Theme::getThemeColor(Theme::TEXT));
if (instances == 0)
{
radioNormal = Theme::getImageFromTheme("radioout.png");