summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaximilian Philipps <Turmfalke2007@web.de>2009-08-01 20:38:59 +0200
committerJared Adams <jaxad0127@gmail.com>2009-08-01 13:14:08 -0600
commit5858cbe02393c64ae75952f390bd2012082bcc5b (patch)
treebb5b22ab44372b16726fd014bf8e63126e3262a8
parentac839db81173f6e54ab4f3b74a4c90e3a5072d41 (diff)
downloadmana-5858cbe02393c64ae75952f390bd2012082bcc5b.tar.gz
mana-5858cbe02393c64ae75952f390bd2012082bcc5b.tar.bz2
mana-5858cbe02393c64ae75952f390bd2012082bcc5b.tar.xz
mana-5858cbe02393c64ae75952f390bd2012082bcc5b.zip
makes tab colours also configurable
-rw-r--r--src/gui/palette.cpp1
-rw-r--r--src/gui/palette.h1
-rw-r--r--src/gui/setup_colors.cpp1
-rw-r--r--src/gui/widgets/tab.cpp2
4 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/palette.cpp b/src/gui/palette.cpp
index c1b9dd7f..52288d51 100644
--- a/src/gui/palette.cpp
+++ b/src/gui/palette.cpp
@@ -84,6 +84,7 @@ Palette::Palette() :
addColor(PROGRESS_BAR, 0xffffff, STATIC, indent + _("Progress Bar Labels"));
addColor(BUTTON, 0x000000, STATIC, indent + _("Buttons"));
addColor(BUTTON_DISABLED, 0x000000, STATIC, indent + _("Disabled Buttons"));
+ addColor(TAB, 0x000000, STATIC, indent + _("Tabs"));
addColor(BACKGROUND, 0xffffff, STATIC, _("Background"));
diff --git a/src/gui/palette.h b/src/gui/palette.h
index 094bbd03..c68a4e1c 100644
--- a/src/gui/palette.h
+++ b/src/gui/palette.h
@@ -59,6 +59,7 @@ class Palette : public gcn::ListModel
ENTRY(PROGRESS_BAR)\
ENTRY(BUTTON)\
ENTRY(BUTTON_DISABLED)\
+ ENTRY(TAB)\
ENTRY(BACKGROUND)\
ENTRY(HIGHLIGHT)\
ENTRY(TAB_HIGHLIGHT)\
diff --git a/src/gui/setup_colors.cpp b/src/gui/setup_colors.cpp
index 7ad13cba..7e8b8946 100644
--- a/src/gui/setup_colors.cpp
+++ b/src/gui/setup_colors.cpp
@@ -264,6 +264,7 @@ void Setup_Colors::valueChanged(const gcn::SelectionEvent &event)
break;
case Palette::BUTTON:
case Palette::BUTTON_DISABLED:
+ case Palette::TAB:
case Palette::TAB_HIGHLIGHT:
mTextPreview->setFont(gui->getFont());
mTextPreview->setTextColor(col);
diff --git a/src/gui/widgets/tab.cpp b/src/gui/widgets/tab.cpp
index f2231fca..26bcc636 100644
--- a/src/gui/widgets/tab.cpp
+++ b/src/gui/widgets/tab.cpp
@@ -63,7 +63,7 @@ static TabData const data[TAB_COUNT] = {
ImageRect Tab::tabImg[TAB_COUNT];
Tab::Tab() : gcn::Tab(),
- mTabColor(&guiPalette->getColor(Palette::TEXT))
+ mTabColor(&guiPalette->getColor(Palette::TAB))
{
init();
}