UI layout improvements

supernovaengine · Aug 7, 2023 · 63c810f · 63c810f
1 parent c5dce6b
commit 63c810f
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 52 deletions.
diff --git a/engine/core/subsystem/UISystem.cpp b/engine/core/subsystem/UISystem.cpp
@@ -724,6 +724,58 @@ void UISystem::destroy(){
 void UISystem::draw(){
 }
 
+void UISystem::createOrUpdateUiComponent(double dt, UILayoutComponent& layout, Entity entity, Signature signature){
+    if (signature.test(scene->getComponentType<UIComponent>())){
+        UIComponent& ui = scene->getComponent<UIComponent>(entity);
+
+        // Texts
+        if (signature.test(scene->getComponentType<TextComponent>())){
+            TextComponent& text = scene->getComponent<TextComponent>(entity);
+
+            createOrUpdateText(text, ui, layout);
+        }
+
+        // UI Polygons
+        if (signature.test(scene->getComponentType<PolygonComponent>())){
+            PolygonComponent& polygon = scene->getComponent<PolygonComponent>(entity);
+
+            createOrUpdatePolygon(polygon, ui, layout);
+        }
+
+        // Images
+        if (signature.test(scene->getComponentType<ImageComponent>())){
+            ImageComponent& img = scene->getComponent<ImageComponent>(entity);
+
+            createOrUpdateImage(img, ui, layout);
+
+            // Buttons
+            if (signature.test(scene->getComponentType<ButtonComponent>())){
+                ButtonComponent& button = scene->getComponent<ButtonComponent>(entity);
+
+                if (button.needUpdateButton){
+                    updateButton(entity, button, img, ui, layout);
+
+                    button.needUpdateButton = false;
+                }
+            }
+
+            // Textedits
+            if (signature.test(scene->getComponentType<TextEditComponent>())){
+                TextEditComponent& textedit = scene->getComponent<TextEditComponent>(entity);
+
+                if (textedit.needUpdateTextEdit){
+                    updateTextEdit(entity, textedit, img, ui, layout);
+
+                    textedit.needUpdateTextEdit = false;
+                }
+
+                blinkCursorTextEdit(dt, textedit, ui);
+            }
+        }
+
+    }
+}
+
 void UISystem::update(double dt){
 
     // need to be ordered by Transform
@@ -735,6 +787,8 @@ void UISystem::update(double dt){
         Entity entity = layouts->getEntity(i);
         Signature signature = scene->getSignature(entity);
 
+        createOrUpdateUiComponent(dt, layout, entity, signature);
+
         if (signature.test(scene->getComponentType<UIContainerComponent>())){
             UIContainerComponent& container = scene->getComponent<UIContainerComponent>(entity);
             // configuring all container boxes
@@ -758,9 +812,6 @@ void UISystem::update(double dt){
                     }
                 }
 
-                //TODO: Fix when container child is an image not loaded yet and size is 0.
-                //      Container size is setted without this image size and it keeps small.
-                //      To test: Use a container with defined size image and other non defined size.
                 layout.width = (layout.width > 0)? layout.width : genWidth;
                 layout.height = (layout.height > 0)? layout.height : genHeight;
 
@@ -913,55 +964,7 @@ void UISystem::update(double dt){
             layout.needUpdateSizes = false;
         }
 
-        if (signature.test(scene->getComponentType<UIComponent>())){
-            UIComponent& ui = scene->getComponent<UIComponent>(entity);
-
-            // Texts
-            if (signature.test(scene->getComponentType<TextComponent>())){
-                TextComponent& text = scene->getComponent<TextComponent>(entity);
-
-                createOrUpdateText(text, ui, layout);
-            }
-
-            // UI Polygons
-            if (signature.test(scene->getComponentType<PolygonComponent>())){
-                PolygonComponent& polygon = scene->getComponent<PolygonComponent>(entity);
-
-                createOrUpdatePolygon(polygon, ui, layout);
-            }
-
-            // Images
-            if (signature.test(scene->getComponentType<ImageComponent>())){
-                ImageComponent& img = scene->getComponent<ImageComponent>(entity);
-
-                createOrUpdateImage(img, ui, layout);
-
-                // Buttons
-                if (signature.test(scene->getComponentType<ButtonComponent>())){
-                    ButtonComponent& button = scene->getComponent<ButtonComponent>(entity);
-
-                    if (button.needUpdateButton){
-                        updateButton(entity, button, img, ui, layout);
-
-                        button.needUpdateButton = false;
-                    }
-                }
-
-                // Textedits
-                if (signature.test(scene->getComponentType<TextEditComponent>())){
-                    TextEditComponent& textedit = scene->getComponent<TextEditComponent>(entity);
-
-                    if (textedit.needUpdateTextEdit){
-                        updateTextEdit(entity, textedit, img, ui, layout);
-
-                        textedit.needUpdateTextEdit = false;
-                    }
-
-                    blinkCursorTextEdit(dt, textedit, ui);
-                }
-            }
-
-        }
+        createOrUpdateUiComponent(dt, layout, entity, signature);
 
         if (signature.test(scene->getComponentType<UIContainerComponent>())){
             UIContainerComponent& container = scene->getComponent<UIContainerComponent>(entity);

diff --git a/engine/core/subsystem/UISystem.h b/engine/core/subsystem/UISystem.h
@@ -26,6 +26,8 @@ namespace Supernova{
 
 		std::string eventId;
 
+		void createOrUpdateUiComponent(double dt, UILayoutComponent& layout, Entity entity, Signature signature);
+
 		//Image
 		bool createImagePatches(ImageComponent& img, UIComponent& ui, UILayoutComponent& layout);