From 5ba73ebf1fd3b8b2a926a4893f179e617cd6785e Mon Sep 17 00:00:00 2001
From: Leon Styhre <leon@leonstyhre.com>
Date: Thu, 23 Feb 2023 17:10:55 +0100
Subject: [PATCH] Added two new flipHorizontal and flipVertical properties to
 image element.

---
 es-core/src/ThemeData.cpp                 |  2 ++
 es-core/src/components/ImageComponent.cpp | 30 ++++++++++++++++++-----
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/es-core/src/ThemeData.cpp b/es-core/src/ThemeData.cpp
index 896ff8f6f..79abe4525 100644
--- a/es-core/src/ThemeData.cpp
+++ b/es-core/src/ThemeData.cpp
@@ -290,6 +290,8 @@ std::map<std::string, std::map<std::string, ThemeData::ElementPropertyType>>
        {"origin", NORMALIZED_PAIR},
        {"rotation", FLOAT},
        {"rotationOrigin", NORMALIZED_PAIR},
+       {"flipHorizontal", BOOLEAN},
+       {"flipVertical", BOOLEAN},
        {"path", PATH},
        {"default", PATH},
        {"imageType", STRING},
diff --git a/es-core/src/components/ImageComponent.cpp b/es-core/src/components/ImageComponent.cpp
index 4e1526075..e4727e5f6 100644
--- a/es-core/src/components/ImageComponent.cpp
+++ b/es-core/src/components/ImageComponent.cpp
@@ -513,6 +513,12 @@ void ImageComponent::applyTheme(const std::shared_ptr<ThemeData>& theme,
         setImage(path, tile);
     }
 
+    if (elem->has("flipHorizontal"))
+        setFlipX(elem->get<bool>("flipHorizontal"));
+
+    if (elem->has("flipVertical"))
+        setFlipY(elem->get<bool>("flipVertical"));
+
     bool updateAlignment {false};
 
     if (elem->has("tileHorizontalAlignment")) {
@@ -729,21 +735,33 @@ void ImageComponent::updateVertices()
         const float pxA {mSize.x / mTileWidth};
         const float pyA {mSize.y / mTileHeight};
 
-        if (mTileHorizontalAlignment == Alignment::ALIGN_RIGHT) {
+        if (mTileHorizontalAlignment == (mFlipX ? Alignment::ALIGN_LEFT : Alignment::ALIGN_RIGHT)) {
             float offsetX {pxA - std::floor(pxA)};
             if (offsetX != 0.0f) {
                 const float moveX {(mTileWidth * offsetX) / mSize.x};
-                topLeftAlign.x -= moveX * pxA;
-                bottomRightAlign.x -= moveX;
+                if (mFlipX) {
+                    topLeftAlign.x += moveX * pxA;
+                    bottomRightAlign.x += moveX;
+                }
+                else {
+                    topLeftAlign.x -= moveX * pxA;
+                    bottomRightAlign.x -= moveX;
+                }
             }
         }
 
-        if (mTileVerticalAlignment == Alignment::ALIGN_TOP) {
+        if (mTileVerticalAlignment == (mFlipY ? Alignment::ALIGN_BOTTOM : Alignment::ALIGN_TOP)) {
             float offsetY {pyA - std::floor(pyA)};
             if (offsetY != 0.0f) {
                 const float moveY {(mTileHeight * offsetY) / mSize.y};
-                topLeftAlign.y += moveY * pyA;
-                bottomRightAlign.y += moveY * pyA;
+                if (mFlipY) {
+                    topLeftAlign.y -= moveY * pyA;
+                    bottomRightAlign.y -= moveY * pyA;
+                }
+                else {
+                    topLeftAlign.y += moveY * pyA;
+                    bottomRightAlign.y += moveY * pyA;
+                }
             }
         }