From 114a5b434e031bb70e3ff607e2933e0a6df7abe5 Mon Sep 17 00:00:00 2001
From: Dominic Masters <dominic@domsplace.com>
Date: Sun, 9 Jul 2023 22:06:50 -0700
Subject: [PATCH] Need to support text alignment

---
 src/dawn/scene/components/ui/UIComponent.cpp | 9 ++++-----
 src/dawn/scene/components/ui/UIComponent.hpp | 2 ++
 src/dawn/scene/components/ui/UIEmpty.cpp     | 8 ++++++--
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/dawn/scene/components/ui/UIComponent.cpp b/src/dawn/scene/components/ui/UIComponent.cpp
index ada67e55..d6892a08 100644
--- a/src/dawn/scene/components/ui/UIComponent.cpp
+++ b/src/dawn/scene/components/ui/UIComponent.cpp
@@ -38,9 +38,8 @@ void UIComponent::updateAlignment() {
 
   assertNotNull(dimensional);
 
-  float_t parentWidth, parentHeight;
-  parentWidth = dimensional->getContentWidth();
-  parentHeight = dimensional->getContentHeight();
+  parentInnerWidth = dimensional->getContentWidth();
+  parentInnerHeight = dimensional->getContentHeight();
 
   UIComponent::calculateDimensions(
     this->alignX,
@@ -48,7 +47,7 @@ void UIComponent::updateAlignment() {
     this->alignUnitRight,
     &translate.x,
     &this->width,
-    parentWidth,
+    parentInnerWidth,
     this->getContentWidth(),
     glm::vec2(align[0], align[2])
   );
@@ -58,7 +57,7 @@ void UIComponent::updateAlignment() {
     this->alignUnitBottom,
     &translate.y,
     &this->height,
-    parentHeight,
+    parentInnerHeight,
     this->getContentHeight(),
     glm::vec2(align[1], align[3])
   );
diff --git a/src/dawn/scene/components/ui/UIComponent.hpp b/src/dawn/scene/components/ui/UIComponent.hpp
index ab82f42d..d2b67ad7 100644
--- a/src/dawn/scene/components/ui/UIComponent.hpp
+++ b/src/dawn/scene/components/ui/UIComponent.hpp
@@ -28,6 +28,8 @@ namespace Dawn {
     protected:
       float_t width = 1;
       float_t height = 1;
+      float_t parentInnerWidth = 1;
+      float_t parentInnerHeight = 1;
       
       /**
        * Simply returns this UI Components' dimensional parent, used for the
diff --git a/src/dawn/scene/components/ui/UIEmpty.cpp b/src/dawn/scene/components/ui/UIEmpty.cpp
index 3c61d065..4342c4d7 100644
--- a/src/dawn/scene/components/ui/UIEmpty.cpp
+++ b/src/dawn/scene/components/ui/UIEmpty.cpp
@@ -9,7 +9,11 @@ using namespace Dawn;
 
 UIEmpty::UIEmpty(SceneItem *item) : UIComponent(item) { }
 
-float_t UIEmpty::getContentWidth() { return 0.0f; }
-float_t UIEmpty::getContentHeight() { return 0.0f; }
+float_t UIEmpty::getContentWidth() {
+  return this->getWidth();
+}
+float_t UIEmpty::getContentHeight() {
+  return this->getHeight();
+}
 float_t UIEmpty::getChildOffsetX() { return 0.0f; }
 float_t UIEmpty::getChildOffsetY() { return 0.0f; }
\ No newline at end of file