Revert "[NUI] Support Layout for Multi-Window"

This reverts commit 64303e2117e6b458c827901aa529be34e64d65b4.

diff --git a/src/Tizen.NUI/src/public/BaseComponents/ViewInternal.cs b/src/Tizen.NUI/src/public/BaseComponents/ViewInternal.cs
index 9df11432382d6ac5ab5d6c402826b2b139b96f3c..d154a4ba97df2251d478daeecb8ce856a5f9b767 100755 (executable)
--- a/src/Tizen.NUI/src/public/BaseComponents/ViewInternal.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/ViewInternal.cs
@@ -189,7 +189,7 @@ namespace Tizen.NUI.BaseComponents
 
         internal void SetLayout(LayoutItem layout)
         {
-            Window.Get(this)?.LayoutController.CreateProcessCallback();
+            Window.Instance.LayoutController.CreateProcessCallback();
             this.layout = layout;
             this.layout?.AttachToOwner(this);
             this.layout?.RequestLayout();

diff --git a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/MultiWindowLayoutSample.cs b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/MultiWindowLayoutSample.cs
deleted file mode 100644 (file)
index aee747a..0000000
--- a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/MultiWindowLayoutSample.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-using Tizen.NUI.BaseComponents;
-using Tizen.NUI.Components;
-
-namespace Tizen.NUI.Samples
-{
-    public class MultiWindowLayoutSample : IExample
-    {
-        private Window mainWindow = null;
-        private Window subWindow = null;
-        private View mainView = null;
-        private View subView = null;
-
-        public void Activate()
-        {
-            mainWindow = NUIApplication.GetDefaultWindow();
-
-            mainView = new View()
-            {
-                Layout = new LinearLayout(),
-                WidthSpecification = LayoutParamPolicies.MatchParent,
-                HeightSpecification = LayoutParamPolicies.MatchParent,
-                BackgroundColor = Color.White
-            };
-            mainWindow.Add(mainView);
-
-            var mainChild = new View()
-            {
-                WidthSpecification = LayoutParamPolicies.MatchParent,
-                HeightSpecification = LayoutParamPolicies.MatchParent,
-                BackgroundColor = Color.Red
-            };
-            mainView.Add(mainChild);
-
-            var mainChild2 = new View()
-            {
-                WidthSpecification = LayoutParamPolicies.MatchParent,
-                HeightSpecification = LayoutParamPolicies.MatchParent,
-                BackgroundColor = Color.Yellow
-            };
-            mainView.Add(mainChild2);
-
-            subWindow = new Window();
-
-            subView = new View()
-            {
-                Layout = new LinearLayout(),
-                WidthSpecification = LayoutParamPolicies.MatchParent,
-                HeightSpecification = LayoutParamPolicies.MatchParent,
-                BackgroundColor = Color.White
-            };
-            subWindow.Add(subView);
-
-            var subChild = new View()
-            {
-                WidthSpecification = LayoutParamPolicies.MatchParent,
-                HeightSpecification = LayoutParamPolicies.MatchParent,
-                BackgroundColor = Color.Green
-            };
-            subView.Add(subChild);
-
-            var subChild2 = new View()
-            {
-                WidthSpecification = LayoutParamPolicies.MatchParent,
-                HeightSpecification = LayoutParamPolicies.MatchParent,
-                BackgroundColor = Color.Blue
-            };
-            subView.Add(subChild2);
-        }
-
-        public void Deactivate()
-        {
-            if (subWindow != null)
-            {
-                if (subView != null)
-                {
-                    subWindow.Remove(subView);
-                    subView.Dispose();
-                    subView = null;
-                }
-
-                subWindow.Dispose();
-                subWindow = null;
-            }
-
-            if (mainWindow != null)
-            {
-                if (mainView != null)
-                {
-                    mainWindow.Remove(mainView);
-                    mainView.Dispose();
-                    mainView = null;
-                }
-
-                mainWindow = null;
-            }
-        }
-    }
-}