From 7d3059516fc25134d0d29b497e546f2846162399 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 6 Sep 2012 23:55:41 +0300 Subject: Add colors font color for highlighted and selected tab. New colors: TAB_HIGHLIGHTED, TAB_SELECTED --- data/graphics/gui/colors.xml | 2 ++ data/themes/blacknblack/colors.xml | 2 ++ data/themes/blackwood/colors.xml | 2 ++ data/themes/enchilado/colors.xml | 2 ++ data/themes/mana/colors.xml | 2 ++ data/themes/pink/colors.xml | 2 ++ data/themes/unity/colors.xml | 2 ++ data/themes/wood/colors.xml | 2 ++ src/gui/theme.cpp | 2 ++ src/gui/theme.h | 2 ++ src/gui/widgets/tab.cpp | 9 ++++++++- src/gui/widgets/tab.h | 2 ++ 12 files changed, 30 insertions(+), 1 deletion(-) diff --git a/data/graphics/gui/colors.xml b/data/graphics/gui/colors.xml index 2ddf9c7fd..b0fa0444e 100644 --- a/data/graphics/gui/colors.xml +++ b/data/graphics/gui/colors.xml @@ -13,6 +13,8 @@ + + diff --git a/data/themes/blacknblack/colors.xml b/data/themes/blacknblack/colors.xml index 7bc5fd8a5..abdac6e79 100644 --- a/data/themes/blacknblack/colors.xml +++ b/data/themes/blacknblack/colors.xml @@ -13,6 +13,8 @@ + + diff --git a/data/themes/blackwood/colors.xml b/data/themes/blackwood/colors.xml index 0f1a16cd8..4d739182f 100644 --- a/data/themes/blackwood/colors.xml +++ b/data/themes/blackwood/colors.xml @@ -13,6 +13,8 @@ + + diff --git a/data/themes/enchilado/colors.xml b/data/themes/enchilado/colors.xml index 4b44470a0..1ea877c6d 100644 --- a/data/themes/enchilado/colors.xml +++ b/data/themes/enchilado/colors.xml @@ -13,6 +13,8 @@ + + diff --git a/data/themes/mana/colors.xml b/data/themes/mana/colors.xml index be4522b8a..3081a7493 100644 --- a/data/themes/mana/colors.xml +++ b/data/themes/mana/colors.xml @@ -13,6 +13,8 @@ + + diff --git a/data/themes/pink/colors.xml b/data/themes/pink/colors.xml index 2aaae8a58..0b69b1149 100644 --- a/data/themes/pink/colors.xml +++ b/data/themes/pink/colors.xml @@ -13,6 +13,8 @@ + + diff --git a/data/themes/unity/colors.xml b/data/themes/unity/colors.xml index f0f11f928..564c024de 100644 --- a/data/themes/unity/colors.xml +++ b/data/themes/unity/colors.xml @@ -12,6 +12,8 @@ + + diff --git a/data/themes/wood/colors.xml b/data/themes/wood/colors.xml index 4d7f0a083..ef4e698f4 100644 --- a/data/themes/wood/colors.xml +++ b/data/themes/wood/colors.xml @@ -13,6 +13,8 @@ + + diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp index 2d21f1a2b..fd6ccc23d 100644 --- a/src/gui/theme.cpp +++ b/src/gui/theme.cpp @@ -685,6 +685,8 @@ static int readColorType(const std::string &type) "LISTBOX", "RADIOBUTTON", "TAB", + "TAB_HIGHLIGHTED", + "TAB_SELECTED", "TEXTBOX", "TEXTFIELD", "WINDOW", diff --git a/src/gui/theme.h b/src/gui/theme.h index de027523d..f73988c48 100644 --- a/src/gui/theme.h +++ b/src/gui/theme.h @@ -177,6 +177,8 @@ class Theme : public Palette, public ConfigListener LISTBOX, RADIOBUTTON, TAB, + TAB_HIGHLIGHTED, + TAB_SELECTED, TEXTBOX, TEXTFIELD, WINDOW, diff --git a/src/gui/widgets/tab.cpp b/src/gui/widgets/tab.cpp index eb470cc02..479735e7c 100644 --- a/src/gui/widgets/tab.cpp +++ b/src/gui/widgets/tab.cpp @@ -64,6 +64,8 @@ ImageRect Tab::tabImg[TAB_COUNT]; Tab::Tab() : gcn::Tab(), mTabColor(&Theme::getThemeColor(Theme::TAB)), + mTabHighlightedColor(&Theme::getThemeColor(Theme::TAB_HIGHLIGHTED)), + mTabSelectedColor(&Theme::getThemeColor(Theme::TAB_SELECTED)), mVertexes(new GraphicsVertexes()), mRedraw(true), mMode(0), @@ -138,17 +140,22 @@ void Tab::draw(gcn::Graphics *graphics) // check which type of tab to draw if (mTabbedArea) { - mLabel->setForegroundColor(*mTabColor); if (mTabbedArea->isTabSelected(this)) { + mLabel->setForegroundColor(*mTabSelectedColor); mode = TAB_SELECTED; // if tab is selected, it doesnt need to highlight activity mFlash = 0; } else if (mHasMouse) { + mLabel->setForegroundColor(*mTabHighlightedColor); mode = TAB_HIGHLIGHTED; } + else + { + mLabel->setForegroundColor(*mTabColor); + } switch (mFlash) { diff --git a/src/gui/widgets/tab.h b/src/gui/widgets/tab.h index 0907379d0..d0fa41eb6 100644 --- a/src/gui/widgets/tab.h +++ b/src/gui/widgets/tab.h @@ -87,6 +87,8 @@ class Tab : public gcn::Tab, public gcn::WidgetListener static float mAlpha; const gcn::Color *mTabColor; + const gcn::Color *mTabHighlightedColor; + const gcn::Color *mTabSelectedColor; int mFlash; GraphicsVertexes *mVertexes; bool mRedraw; -- cgit v1.2.3-70-g09d2