summaryrefslogtreecommitdiff
path: root/src/gui/widgets/widget2.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-03-16 15:41:51 +0300
committerAndrei Karas <akaras@inbox.ru>2014-03-16 15:41:51 +0300
commit1b75e974088a94cd28d7a48729545904b2cd908b (patch)
treed771752fd0da4c58c8ff2d941c47274ead984e42 /src/gui/widgets/widget2.h
parent46087564d4184b28740b0c45c1bac199ab1942ec (diff)
downloadmanaverse-1b75e974088a94cd28d7a48729545904b2cd908b.tar.gz
manaverse-1b75e974088a94cd28d7a48729545904b2cd908b.tar.bz2
manaverse-1b75e974088a94cd28d7a48729545904b2cd908b.tar.xz
manaverse-1b75e974088a94cd28d7a48729545904b2cd908b.zip
Remove some useless static methods from theme.
Diffstat (limited to 'src/gui/widgets/widget2.h')
-rw-r--r--src/gui/widgets/widget2.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/gui/widgets/widget2.h b/src/gui/widgets/widget2.h
index ff565815f..2d73418ba 100644
--- a/src/gui/widgets/widget2.h
+++ b/src/gui/widgets/widget2.h
@@ -36,16 +36,18 @@ class Widget2
const int alpha = 255)
const A_WARN_UNUSED
{
- return Theme::getThemeColor(mPaletteOffset + type, alpha);
+ return theme->getColor(mPaletteOffset + type, alpha);
}
inline const Color &getThemeCharColor(const signed char c,
bool &valid)
const A_WARN_UNUSED
{
- const int colorId = Theme::getThemeIdByChar(c, valid);
+ if (!theme)
+ return Palette::BLACK;
+ const int colorId = theme->getIdByChar(c, valid);;
if (valid)
- return Theme::getThemeColor(mPaletteOffset + colorId);
+ return theme->getColor(mPaletteOffset + colorId, 255);
else
return Palette::BLACK;
}