summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorIra Rice <irarice@gmail.com>2009-03-14 09:47:20 -0600
committerIra Rice <irarice@gmail.com>2009-03-14 09:47:20 -0600
commitf754da1e3a3a4d2c377cb8d1b61899783dff5736 (patch)
tree7aba94495cdb33ba91c5ecc79ad22435ea45dd36 /src/gui
parent998a63d41fcb9cc7b9ac04ed20ca02f4f83775c9 (diff)
downloadmana-client-f754da1e3a3a4d2c377cb8d1b61899783dff5736.tar.gz
mana-client-f754da1e3a3a4d2c377cb8d1b61899783dff5736.tar.bz2
mana-client-f754da1e3a3a4d2c377cb8d1b61899783dff5736.tar.xz
mana-client-f754da1e3a3a4d2c377cb8d1b61899783dff5736.zip
Got rid of two direct references to the color black. These now always
pull from the stored text color. This should help in situations in which the user has their own custom skin in the future, and needs to adjust text colors to be more friendly to a darker skin. Signed-off-by: Ira Rice <irarice@gmail.com>
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/emoteshortcutcontainer.cpp3
-rw-r--r--src/gui/itemshortcutcontainer.cpp3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/emoteshortcutcontainer.cpp b/src/gui/emoteshortcutcontainer.cpp
index 8c9df14e..47fb9b06 100644
--- a/src/gui/emoteshortcutcontainer.cpp
+++ b/src/gui/emoteshortcutcontainer.cpp
@@ -21,6 +21,7 @@
*/
#include "emoteshortcutcontainer.h"
+#include "palette.h"
#include "../animatedsprite.h"
#include "../configuration.h"
@@ -99,7 +100,7 @@ void EmoteShortcutContainer::draw(gcn::Graphics *graphics)
// Draw emote keyboard shortcut.
const char *key = SDL_GetKeyName(
(SDLKey) keyboard.getKeyValue(keyboard.KEY_EMOTE_1 + i));
- graphics->setColor(0x000000);
+ graphics->setColor(guiPalette->getColor(Palette::TEXT));
g->drawText(key, emoteX + 2, emoteY + 2, gcn::Graphics::LEFT);
if (emoteShortcut->getEmote(i))
diff --git a/src/gui/itemshortcutcontainer.cpp b/src/gui/itemshortcutcontainer.cpp
index cbbbaf60..a0697c5d 100644
--- a/src/gui/itemshortcutcontainer.cpp
+++ b/src/gui/itemshortcutcontainer.cpp
@@ -23,6 +23,7 @@
#include "inventorywindow.h"
#include "itemshortcutcontainer.h"
#include "itempopup.h"
+#include "palette.h"
#include "viewport.h"
#include "../configuration.h"
@@ -91,7 +92,7 @@ void ItemShortcutContainer::draw(gcn::Graphics *graphics)
// Draw item keyboard shortcut.
const char *key = SDL_GetKeyName(
(SDLKey) keyboard.getKeyValue(keyboard.KEY_SHORTCUT_1 + i));
- graphics->setColor(0x000000);
+ graphics->setColor(guiPalette->getColor(Palette::TEXT));
g->drawText(key, itemX + 2, itemY + 2, gcn::Graphics::LEFT);
if (itemShortcut->getItem(i) < 0)