summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2009-05-11 18:40:08 -0600
committerJared Adams <jaxad0127@gmail.com>2009-05-11 18:46:49 -0600
commit9c19ba0ce027fe987b101f14f35b765159947eb0 (patch)
tree2e09491ecd15c99c3cc45ebe57a8dc50c54c31d2
parent39aa603099c27f9a9012a32218ea712f345c75e3 (diff)
downloadmana-9c19ba0ce027fe987b101f14f35b765159947eb0.tar.gz
mana-9c19ba0ce027fe987b101f14f35b765159947eb0.tar.bz2
mana-9c19ba0ce027fe987b101f14f35b765159947eb0.tar.xz
mana-9c19ba0ce027fe987b101f14f35b765159947eb0.zip
Switch Tab to a color pointer to update on the fly
-rw-r--r--src/gui/widgets/tab.cpp8
-rw-r--r--src/gui/widgets/tab.h4
-rw-r--r--src/gui/widgets/whispertab.cpp2
-rw-r--r--src/net/ea/gui/partytab.cpp2
4 files changed, 8 insertions, 8 deletions
diff --git a/src/gui/widgets/tab.cpp b/src/gui/widgets/tab.cpp
index c98ecee4..f2231fca 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::TEXT))
{
init();
}
@@ -127,7 +127,7 @@ void Tab::draw(gcn::Graphics *graphics)
{
mode = TAB_SELECTED;
// if tab is selected, it doesnt need to highlight activity
- mLabel->setForegroundColor(mTabColor);
+ mLabel->setForegroundColor(*mTabColor);
mHighlighted = false;
}
else if (mHighlighted)
@@ -137,7 +137,7 @@ void Tab::draw(gcn::Graphics *graphics)
}
else
{
- mLabel->setForegroundColor(mTabColor);
+ mLabel->setForegroundColor(*mTabColor);
}
}
@@ -163,7 +163,7 @@ void Tab::draw(gcn::Graphics *graphics)
drawChildren(graphics);
}
-void Tab::setTabColor(const gcn::Color &color)
+void Tab::setTabColor(const gcn::Color *color)
{
mTabColor = color;
}
diff --git a/src/gui/widgets/tab.h b/src/gui/widgets/tab.h
index 134d5591..eea2586c 100644
--- a/src/gui/widgets/tab.h
+++ b/src/gui/widgets/tab.h
@@ -45,7 +45,7 @@ class Tab : public gcn::Tab
/**
* Set the normal color fo the tab's text.
*/
- void setTabColor(const gcn::Color &color);
+ void setTabColor(const gcn::Color *color);
/**
* Set tab highlighted
@@ -64,7 +64,7 @@ class Tab : public gcn::Tab
static int mInstances; /**< Number of tab instances */
static float mAlpha;
- gcn::Color mTabColor;
+ const gcn::Color *mTabColor;
bool mHighlighted;
};
diff --git a/src/gui/widgets/whispertab.cpp b/src/gui/widgets/whispertab.cpp
index 17ee3fc4..23325108 100644
--- a/src/gui/widgets/whispertab.cpp
+++ b/src/gui/widgets/whispertab.cpp
@@ -35,7 +35,7 @@ WhisperTab::WhisperTab(const std::string &nick) :
ChatTab(nick),
mNick(nick)
{
- setTabColor(guiPalette->getColor(Palette::WHISPER));
+ setTabColor(&guiPalette->getColor(Palette::WHISPER));
}
WhisperTab::~WhisperTab()
diff --git a/src/net/ea/gui/partytab.cpp b/src/net/ea/gui/partytab.cpp
index 12ca0d8d..9b0fc8c5 100644
--- a/src/net/ea/gui/partytab.cpp
+++ b/src/net/ea/gui/partytab.cpp
@@ -38,7 +38,7 @@
PartyTab::PartyTab() :
ChatTab(_("Party"))
{
- setTabColor(guiPalette->getColor(Palette::PARTY));
+ setTabColor(&guiPalette->getColor(Palette::PARTY));
}
PartyTab::~PartyTab()