diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2010-03-04 22:41:19 -0700 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2010-03-12 14:49:27 -0700 |
| commit | 781b3c9f17708cc5fe08eb3c9ee38d596364d97c (patch) | |
| tree | 833797c9b9168ab58864ffe4cf8ed028060e44a2 /src/gui/speechbubble.h | |
| parent | 96b64757954f07d196599b3c1131a6603982c930 (diff) | |
| download | mana-client-781b3c9f17708cc5fe08eb3c9ee38d596364d97c.tar.gz mana-client-781b3c9f17708cc5fe08eb3c9ee38d596364d97c.tar.bz2 mana-client-781b3c9f17708cc5fe08eb3c9ee38d596364d97c.tar.xz mana-client-781b3c9f17708cc5fe08eb3c9ee38d596364d97c.zip | |
Split Palette into Theme and UserPalette
Themes can now control the colors they use. Colors in the Viewport (being
names, particles, etc) can still be changed by the user. Also make
ProgressBars more easily colored. DyePalette was made more flexible in the
process.
Also fixes comparing strings of different lengths insensitively.
Reviewed-by: Thorbjørn Lindeijer
Diffstat (limited to 'src/gui/speechbubble.h')
| -rw-r--r-- | src/gui/speechbubble.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/speechbubble.h b/src/gui/speechbubble.h index 6d393d74..8682ab7e 100644 --- a/src/gui/speechbubble.h +++ b/src/gui/speechbubble.h @@ -23,7 +23,7 @@ #ifndef SPEECHBUBBLE_H #define SPEECHBUBBLE_H -#include "gui/palette.h" +#include "gui/theme.h" #include "gui/widgets/popup.h" @@ -42,7 +42,7 @@ class SpeechBubble : public Popup */ void setCaption(const std::string &name, const gcn::Color *color = - &guiPalette->getColor(Palette::TEXT)); + &Theme::getThemeColor(Theme::TEXT)); /** * Sets the text to be displayed. |