Remove some useless static methods from theme.

2 files changed, 6 insertions, 4 deletions

diff --git a/src/gui/widgets/textpreview.cpp b/src/gui/widgets/textpreview.cpp
index 45e71b800..ff0a647b8 100644
--- a/src/gui/widgets/textpreview.cpp
+++ b/src/gui/widgets/textpreview.cpp
@@ -116,7 +116,7 @@ void TextPreview::draw(Graphics* graphics)
         Color(mTextColor2->r, mTextColor2->g, mTextColor2->b, alpha));
 
     if (mOutline && mTextColor != mTextColor2)
-        graphics->setColor2(Theme::getThemeColor(Theme::OUTLINE));
+        graphics->setColor2(getThemeColor(Theme::OUTLINE, 255));
 
     mFont->drawString(graphics, mText, mPadding + 1, mPadding + 1);
     BLOCK_END("TextPreview::draw")
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;
         }