[NUI] Fix Window.Dispose and Layer.LayoutCount

Since Layer.Dispose updates LayoutController.LayoutCount,
LayoutController.Dispose should be called after all layers' Dispose are
called in Window.Dispose.

When a layer's LayoutCount is set, it should update its
LayoutController.LayoutCount by the difference between new and current
LayoutCount.

diff --git a/src/Tizen.NUI/src/public/Common/Layer.cs b/src/Tizen.NUI/src/public/Common/Layer.cs
index fa78077..4b56f75 100755 (executable)
--- a/src/Tizen.NUI/src/public/Common/Layer.cs
+++ b/src/Tizen.NUI/src/public/Common/Layer.cs
@@ -763,15 +763,8 @@ namespace Tizen.NUI
 
                 if (window != null)
                 {
-                    if (value == 0)
-                    {
-                        window.LayoutController.LayoutCount = 0;
-                    }
-                    else
-                    {
-                        int diff = value - layoutCount;
-                        window.LayoutController.LayoutCount += diff;
-                    }
+                    int diff = value - layoutCount;
+                    window.LayoutController.LayoutCount += diff;
                 }
                 layoutCount = value;
             }

diff --git a/src/Tizen.NUI/src/public/Window/Window.cs b/src/Tizen.NUI/src/public/Window/Window.cs
index 3436578..4ef9685 100644 (file)
--- a/src/Tizen.NUI/src/public/Window/Window.cs
+++ b/src/Tizen.NUI/src/public/Window/Window.cs
@@ -1743,13 +1743,6 @@ namespace Tizen.NUI
                     DisposeBorder();
                 }
 
-                if (rootLayer != null)
-                {
-                    rootLayer.Dispose();
-                }
-
-                localController?.Dispose();
-
                 foreach (var layer in childLayers)
                 {
                     if (layer != null)
@@ -1759,6 +1752,8 @@ namespace Tizen.NUI
                 }
 
                 childLayers.Clear();
+
+                localController?.Dispose();
             }
 
             this.DisconnectNativeSignals();