Move functions getColor, getIdByChar from palette to theme and userpalette.

1 files changed, 25 insertions, 0 deletions

diff --git a/src/gui/theme.h b/src/gui/theme.h
index edbe31a08..5a9a75bb0 100644
--- a/src/gui/theme.h
+++ b/src/gui/theme.h
@@ -125,6 +125,31 @@ class Theme final : public Palette,
         { return mMinimumOpacity; }
 
         /**
+         * Gets the color associated with the type. Sets the alpha channel
+         * before returning.
+         *
+         * @param type the color type requested
+         * @param alpha alpha channel to use
+         *
+         * @return the requested color
+         */
+        inline const Color &getColor(int type,
+                                     const int alpha = 255) A_WARN_UNUSED
+        {
+            if (type >= static_cast<signed>(mColors.size()) || type < 0)
+            {
+                logger->log("incorrect color request type: %d from %u",
+                    type, static_cast<unsigned int>(mColors.size()));
+                type = 0;
+            }
+            Color* col = &mColors[type].color;
+            col->a = alpha;
+            return *col;
+        }
+
+        int getIdByChar(const signed char c, bool &valid) const A_WARN_UNUSED;
+
+        /**
          * Set the minimum opacity allowed to skins.
          * Set a negative value to free the minimum allowed.
          */