From 31c5b200d192250d18f4759b7c1cc4b08fb767e1 Mon Sep 17 00:00:00 2001
From: Leon Styhre <leon@leonstyhre.com>
Date: Sun, 13 Feb 2022 15:01:55 +0100
Subject: [PATCH] Added support for using unsigned integers for theme
 properties.

---
 es-core/src/ThemeData.cpp                    | 13 +++++++++----
 es-core/src/ThemeData.h                      |  1 +
 es-core/src/components/BadgeComponent.cpp    | 12 ++++++------
 es-core/src/components/CarouselComponent.cpp |  2 +-
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/es-core/src/ThemeData.cpp b/es-core/src/ThemeData.cpp
index 55c6f7f94..2ead841c9 100644
--- a/es-core/src/ThemeData.cpp
+++ b/es-core/src/ThemeData.cpp
@@ -88,8 +88,8 @@ std::map<std::string, std::map<std::string, ThemeData::ElementPropertyType>>
        {"rotationOrigin", NORMALIZED_PAIR},
        {"path", PATH},
        {"default", PATH},
-       {"tile", BOOLEAN},
        {"imageType", STRING},
+       {"tile", BOOLEAN},
        {"interpolation", STRING},
        {"color", COLOR},
        {"colorEnd", COLOR},
@@ -141,8 +141,8 @@ std::map<std::string, std::map<std::string, ThemeData::ElementPropertyType>>
        {"horizontalAlignment", STRING},
        {"alignment", STRING}, // For backward compatibility with legacy themes.
        {"direction", STRING},
-       {"lines", FLOAT},
-       {"itemsPerLine", FLOAT},
+       {"lines", UNSIGNED_INTEGER},
+       {"itemsPerLine", UNSIGNED_INTEGER},
        {"itemMargin", NORMALIZED_PAIR},
        {"slots", STRING},
        {"controllerPos", NORMALIZED_PAIR},
@@ -245,7 +245,7 @@ std::map<std::string, std::map<std::string, ThemeData::ElementPropertyType>>
        {"logoHorizontalAlignment", STRING},
        {"logoVerticalAlignment", STRING},
        {"logoAlignment", STRING}, // For backward compatibility with legacy themes.
-       {"maxLogoCount", FLOAT},
+       {"maxLogoCount", UNSIGNED_INTEGER},
        {"text", STRING},
        {"textColor", COLOR},
        {"textBackgroundColor", COLOR},
@@ -1208,6 +1208,11 @@ void ThemeData::parseElement(const pugi::xml_node& root,
                 }
                 break;
             }
+            case UNSIGNED_INTEGER: {
+                unsigned int integerVal {static_cast<unsigned int>(strtoul(str.c_str(), 0, 0))};
+                element.properties[node.name()] = integerVal;
+                break;
+            }
             case FLOAT: {
                 float floatVal {static_cast<float>(strtod(str.c_str(), 0))};
                 element.properties[node.name()] = floatVal;
diff --git a/es-core/src/ThemeData.h b/es-core/src/ThemeData.h
index 911cf23c7..75a658e9f 100644
--- a/es-core/src/ThemeData.h
+++ b/es-core/src/ThemeData.h
@@ -217,6 +217,7 @@ public:
         PATH,
         STRING,
         COLOR,
+        UNSIGNED_INTEGER,
         FLOAT,
         BOOLEAN
     };
diff --git a/es-core/src/components/BadgeComponent.cpp b/es-core/src/components/BadgeComponent.cpp
index 989133f67..54ded9daf 100644
--- a/es-core/src/components/BadgeComponent.cpp
+++ b/es-core/src/components/BadgeComponent.cpp
@@ -229,25 +229,25 @@ void BadgeComponent::applyTheme(const std::shared_ptr<ThemeData>& theme,
     }
 
     if (elem->has("lines")) {
-        const float lines {elem->get<float>("lines")};
-        if (lines < 1.0f || lines > 10.0f) {
+        const unsigned int lines {elem->get<unsigned int>("lines")};
+        if (lines < 1 || lines > 10) {
             LOG(LogWarning) << "BadgeComponent: Invalid theme configuration, <lines> set to \""
                             << lines << "\"";
         }
         else {
-            mFlexboxComponent.setLines(static_cast<unsigned int>(lines));
+            mFlexboxComponent.setLines(lines);
         }
     }
 
     if (elem->has("itemsPerLine")) {
-        const float itemsPerLine {elem->get<float>("itemsPerLine")};
-        if (itemsPerLine < 1.0f || itemsPerLine > 10.0f) {
+        const unsigned int itemsPerLine {elem->get<unsigned int>("itemsPerLine")};
+        if (itemsPerLine < 1 || itemsPerLine > 10) {
             LOG(LogWarning)
                 << "BadgeComponent: Invalid theme configuration, <itemsPerLine> set to \""
                 << itemsPerLine << "\"";
         }
         else {
-            mFlexboxComponent.setItemsPerLine(static_cast<unsigned int>(itemsPerLine));
+            mFlexboxComponent.setItemsPerLine(itemsPerLine);
         }
     }
 
diff --git a/es-core/src/components/CarouselComponent.cpp b/es-core/src/components/CarouselComponent.cpp
index c651799fb..a1ff64b0f 100644
--- a/es-core/src/components/CarouselComponent.cpp
+++ b/es-core/src/components/CarouselComponent.cpp
@@ -379,7 +379,7 @@ void CarouselComponent::applyTheme(const std::shared_ptr<ThemeData>& theme,
     }
     if (elem->has("maxLogoCount"))
         mMaxLogoCount =
-            glm::clamp(static_cast<int>(std::round(elem->get<float>("maxLogoCount"))), 2, 30);
+            glm::clamp(static_cast<int>(elem->get<unsigned int>("maxLogoCount")), 2, 30);
 
     if (elem->has("logoRotation"))
         mLogoRotation = elem->get<float>("logoRotation");