From 935ea845f1c4282eb01f0c4842dce72896ebabfd Mon Sep 17 00:00:00 2001 From: Jaehyun Cho Date: Wed, 12 Jan 2022 15:34:04 +0900 Subject: [PATCH] Revert "[NUI] Support Layout for Multi-Window" This reverts commit 64303e2117e6b458c827901aa529be34e64d65b4. --- .../src/public/BaseComponents/ViewInternal.cs | 2 +- .../Samples/MultiWindowLayoutSample.cs | 98 ---------------------- 2 files changed, 1 insertion(+), 99 deletions(-) delete mode 100644 test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/MultiWindowLayoutSample.cs diff --git a/src/Tizen.NUI/src/public/BaseComponents/ViewInternal.cs b/src/Tizen.NUI/src/public/BaseComponents/ViewInternal.cs index 9df1143..d154a4b 100755 --- 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 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; - } - } - } -} -- 2.7.4