From 269e2e820207bd1e1027f8692a03cd8d725c152d Mon Sep 17 00:00:00 2001
From: Leon Styhre <leon@leonstyhre.com>
Date: Fri, 3 Jun 2022 20:53:15 +0200
Subject: [PATCH] Added a wheelHorizontalAlignment property for aligning the
 carousel within the overall element area.

---
 es-core/src/ThemeData.cpp                     |  1 +
 .../components/primary/CarouselComponent.h    | 58 +++++++++++++++++++
 2 files changed, 59 insertions(+)

diff --git a/es-core/src/ThemeData.cpp b/es-core/src/ThemeData.cpp
index 7780c7011..aa44003ae 100644
--- a/es-core/src/ThemeData.cpp
+++ b/es-core/src/ThemeData.cpp
@@ -262,6 +262,7 @@ std::map<std::string, std::map<std::string, ThemeData::ElementPropertyType>>
        {"itemRotationOrigin", NORMALIZED_PAIR},
        {"itemHorizontalAlignment", STRING},
        {"itemVerticalAlignment", STRING},
+       {"wheelHorizontalAlignment", STRING},
        {"horizontalOffset", FLOAT},
        {"verticalOffset", FLOAT},
        {"reflections", BOOLEAN},
diff --git a/es-core/src/components/primary/CarouselComponent.h b/es-core/src/components/primary/CarouselComponent.h
index f49ad4713..14b20ed40 100644
--- a/es-core/src/components/primary/CarouselComponent.h
+++ b/es-core/src/components/primary/CarouselComponent.h
@@ -125,6 +125,7 @@ private:
     float mLineSpacing;
     Alignment mItemHorizontalAlignment;
     Alignment mItemVerticalAlignment;
+    Alignment mWheelHorizontalAlignment;
     float mUnfocusedItemOpacity;
     float mMaxItemCount;
     glm::vec2 mItemSize;
@@ -160,6 +161,7 @@ CarouselComponent<T>::CarouselComponent()
     , mLineSpacing {1.5f}
     , mItemHorizontalAlignment {ALIGN_CENTER}
     , mItemVerticalAlignment {ALIGN_CENTER}
+    , mWheelHorizontalAlignment {ALIGN_CENTER}
     , mUnfocusedItemOpacity {0.5f}
     , mMaxItemCount {3.0f}
     , mItemSize {Renderer::getScreenWidth() * 0.25f, Renderer::getScreenHeight() * 0.155f}
@@ -502,10 +504,47 @@ template <typename T> void CarouselComponent<T>::render(const glm::mat4& parentT
     glm::vec2 itemSpacing {0.0f, 0.0f};
     float xOff {0.0f};
     float yOff {0.0f};
+    float scaleSize {mItemSize.x * mItemScale - mItemSize.x};
 
     if (mType == CarouselType::HORIZONTAL_WHEEL || mType == CarouselType::VERTICAL_WHEEL) {
         xOff = (mSize.x - mItemSize.x) / 2.0f - (mEntryCamOffset * itemSpacing.y);
         yOff = (mSize.y - mItemSize.y) / 2.0f;
+        // Alignment of the actual carousel inside to the overall component area.
+        if (mLegacyMode) {
+            if (mItemHorizontalAlignment == ALIGN_LEFT)
+                xOff = mSize.x / 10.0f;
+            else if (mItemHorizontalAlignment == ALIGN_RIGHT)
+                xOff = mSize.x - (mItemSize.x * 1.1f);
+            else
+                xOff = (mSize.x - mItemSize.x) / 2.0f;
+        }
+        else {
+            if (mWheelHorizontalAlignment == ALIGN_RIGHT) {
+                xOff += mSize.x / 2.0f;
+                if (mItemHorizontalAlignment == ALIGN_LEFT)
+                    xOff -= mItemSize.x / 2.0f + scaleSize;
+                else if (mItemHorizontalAlignment == ALIGN_RIGHT)
+                    xOff -= mItemSize.x / 2.0f;
+                else
+                    xOff -= mItemSize.x / 2.0f + scaleSize / 2.0f;
+            }
+            else if (mWheelHorizontalAlignment == ALIGN_LEFT) {
+                xOff -= (mSize.x / 2.0f);
+                if (mItemHorizontalAlignment == ALIGN_LEFT)
+                    xOff += mItemSize.x / 2.0f;
+                else if (mItemHorizontalAlignment == ALIGN_RIGHT)
+                    xOff += mItemSize.x / 2.0f + scaleSize;
+                else
+                    xOff += mItemSize.x / 2.0f + scaleSize / 2.0f;
+            }
+            else if (mWheelHorizontalAlignment == ALIGN_CENTER &&
+                     mItemHorizontalAlignment != ALIGN_CENTER) {
+                if (mItemHorizontalAlignment == ALIGN_RIGHT)
+                    xOff += scaleSize / 2.0f;
+                else if (mItemHorizontalAlignment == ALIGN_LEFT)
+                    xOff -= scaleSize / 2.0f;
+            }
+        }
     }
     else if (mType == CarouselType::VERTICAL) {
         itemSpacing.y = ((mSize.y - (mItemSize.y * mMaxItemCount)) / (mMaxItemCount)) + mItemSize.y;
@@ -806,6 +845,25 @@ void CarouselComponent<T>::applyTheme(const std::shared_ptr<ThemeData>& theme,
             }
         }
 
+        if (elem->has("wheelHorizontalAlignment")) {
+            const std::string alignment {elem->get<std::string>("wheelHorizontalAlignment")};
+            if (alignment == "left") {
+                mWheelHorizontalAlignment = ALIGN_LEFT;
+            }
+            else if (alignment == "right") {
+                mWheelHorizontalAlignment = ALIGN_RIGHT;
+            }
+            else if (alignment == "center") {
+                mWheelHorizontalAlignment = ALIGN_CENTER;
+            }
+            else {
+                LOG(LogWarning) << "CarouselComponent: Invalid theme configuration, property "
+                                   "<wheelHorizontalAlignment> defined as \""
+                                << alignment << "\"";
+                mWheelHorizontalAlignment = ALIGN_CENTER;
+            }
+        }
+
         if (elem->has("horizontalOffset"))
             mHorizontalOffset = glm::clamp(elem->get<float>("horizontalOffset"), -1.0f, 1.0f);