From 86e251152cb9cf3ca8b72a3849d29e01d7ce5620 Mon Sep 17 00:00:00 2001
From: Gabriel Tofvesson <gabriel@tofvesson.se>
Date: Sun, 13 Oct 2024 16:52:59 +0200
Subject: [PATCH] Fix Children reload order

---
 gfx/element.lua       |  2 +-
 gfx/list.lua          |  1 +
 gfx/prop/children.lua | 13 ++++++-------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/gfx/element.lua b/gfx/element.lua
index 6f74963..f2951c2 100644
--- a/gfx/element.lua
+++ b/gfx/element.lua
@@ -130,7 +130,7 @@ function Element:setVisible(visible)
   self.visible = visible
   if win ~= nil then
     self:setDirty()
-    self:_getWindow().setVisible(visible)
+    win.setVisible(visible)
   end
 end
 
diff --git a/gfx/list.lua b/gfx/list.lua
index d10cc9f..1199ed9 100644
--- a/gfx/list.lua
+++ b/gfx/list.lua
@@ -57,6 +57,7 @@ function List:getWidth()
 end
 
 function List:_reload()
+  Element._reload(self)
   self:adjustPositions()
 end
 
diff --git a/gfx/prop/children.lua b/gfx/prop/children.lua
index e837a61..2d2f35a 100644
--- a/gfx/prop/children.lua
+++ b/gfx/prop/children.lua
@@ -149,19 +149,18 @@ function Children:with(elementType)
   end
 
   function elementType:_reload()
-    Element._reload(self)
-  
+    if defaultReload ~= nil and defaultReload ~= Element._reload then
+      defaultReload(self)
+    end
+    
     -- Reload child windows
     local win = self:_getWindow()
     for _,child in self:_iterateChildren() do
-      if child:_getWindow() ~= win then
+      if child:_getParent() ~= win then
         child:setParent(win)
+        child:reload()
       end
     end
-
-    if defaultReload ~= nil and defaultReload ~= Element._reload then
-      defaultReload(self)
-    end
   end
 
   return elementType