From: Umar Date: Thu, 27 Apr 2017 11:01:01 +0000 (+0100) Subject: Combined Stage and Window class, and removed Stage class X-Git-Tag: dali_1.2.37~1 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=665d92f07e3e06e1db65a473c6eb6869dc476c03;ds=sidebyside Combined Stage and Window class, and removed Stage class Change-Id: I1e7699c3b11c332195d4f8193626b48d8185ea6c --- diff --git a/plugins/dali-sharp/examples/control-dashboard.cs b/plugins/dali-sharp/examples/control-dashboard.cs index cff8dad..abe7efa 100755 --- a/plugins/dali-sharp/examples/control-dashboard.cs +++ b/plugins/dali-sharp/examples/control-dashboard.cs @@ -40,7 +40,7 @@ namespace MyCSharpExample private Dali.Application _application; private TableView _contentContainer; private Timer _timer; - private Stage _stage; + private Window _window; private Popup _popup; private ProgressBar _progressBar; @@ -62,8 +62,8 @@ namespace MyCSharpExample public void OnInitialize(object source, NUIApplicationInitEventArgs e) { Console.WriteLine("Customized Application Initialize event handler"); - _stage = Stage.GetCurrent(); - _stage.BackgroundColor = Color.White; + _window = Window.Instance; + _window.BackgroundColor = Color.White; // Top label TextLabel topLabel = new TextLabel(); @@ -78,7 +78,7 @@ namespace MyCSharpExample topLabel.HorizontalAlignment = "BEGIN"; topLabel.VerticalAlignment = "CENTER"; topLabel.PointSize = 42.0f; - _stage.Add(topLabel); + _window.Add(topLabel); // Grid container to contain items. Use tableView because FlexContainer support focus navigation just two direction ( up/down or left/right ) _contentContainer = new TableView(6, 5); @@ -86,7 +86,7 @@ namespace MyCSharpExample _contentContainer.SetResizePolicy(ResizePolicyType.SIZE_RELATIVE_TO_PARENT, DimensionType.HEIGHT); _contentContainer.SetSizeModeFactor(new Vector3(0.0f, 0.9f, 0.0f)); _contentContainer.AnchorPoint = NDalic.AnchorPointBottomCenter; - _contentContainer.Position = new Position(0, _stage.Size.Height * 0.1f, 0); + _contentContainer.Position = new Position(0, _window.Size.Height * 0.1f, 0); _contentContainer.SetRelativeHeight(0, 0.07f); _contentContainer.SetRelativeHeight(1, 0.26f); _contentContainer.SetRelativeHeight(2, 0.07f); @@ -94,7 +94,7 @@ namespace MyCSharpExample _contentContainer.SetRelativeHeight(4, 0.07f); _contentContainer.SetRelativeHeight(5, 0.26f); _contentContainer.SetKeyboardFocusable(true); - _stage.Add(_contentContainer); + _window.Add(_contentContainer); CreateContent(); @@ -123,13 +123,13 @@ namespace MyCSharpExample { // Make label for item TextLabel itemLabel = new TextLabel(" " + item.name); - itemLabel.Size = new Vector3(_stage.GetSize().Width * 0.2f, _stage.GetSize().Height * 0.05f, 0.0f); + itemLabel.Size = new Vector3(_window.GetSize().Width * 0.2f, _window.GetSize().Height * 0.05f, 0.0f); itemLabel.HorizontalAlignment = "BEGIN"; itemLabel.VerticalAlignment = "BOTTOM"; itemLabel.PointSize = 18.0f; _contentContainer.AddChild(itemLabel, new TableView.CellPosition(((uint)idx / 5) * 2, (uint)idx % 5)); - // If item is implemented in public, attach it on stage + // If item is implemented in public, attach it on window if (item.isImplemented) { if (item.name.CompareTo("PushButton") == 0) @@ -319,7 +319,7 @@ namespace MyCSharpExample button.Clicked += (obj, ee) => { - _stage.Add(_popup); + _window.Add(_popup); _popup.SetDisplayState(Popup.DisplayStateType.SHOWN); FocusManager.Instance.SetCurrentFocusView((_popup.FindChildByName("Footer")).FindChildByName("OKButton")); return true; @@ -346,7 +346,7 @@ namespace MyCSharpExample text.MultiLine = true; text.HorizontalAlignment = "center"; toast.SetTitle(text); - _stage.Add(toast); + _window.Add(toast); toast.SetDisplayState(Popup.DisplayStateType.SHOWN); } } @@ -362,7 +362,7 @@ namespace MyCSharpExample else { ImageView notSupportView = new ImageView("images/not_yet_sign.png"); - notSupportView.Size = new Vector3(_stage.GetSize().Width * 0.2f, _stage.GetSize().Height * 0.25f, 0.0f); + notSupportView.Size = new Vector3(_window.GetSize().Width * 0.2f, _window.GetSize().Height * 0.25f, 0.0f); notSupportView.SetKeyboardFocusable(true); _contentContainer.AddChild(notSupportView, new TableView.CellPosition(((uint)idx / 5) * 2 + 1, (uint)idx % 5)); diff --git a/plugins/dali-sharp/examples/hello-world.cs b/plugins/dali-sharp/examples/hello-world.cs index 1daf6a0..4f2667c 100755 --- a/plugins/dali-sharp/examples/hello-world.cs +++ b/plugins/dali-sharp/examples/hello-world.cs @@ -27,7 +27,7 @@ namespace MyCSharpExample private Dali.Application _application; private Animation _animation; private TextLabel _text; - private Stage _stage; + private Window _window; public Example(Dali.Application application) { @@ -38,9 +38,9 @@ namespace MyCSharpExample public void Initialize(object source, NUIApplicationInitEventArgs e) { Console.WriteLine("Customized Application Initialize event handler"); - _stage = Stage.Instance; - _stage.BackgroundColor = Color.White; - _stage.Touch += OnStageTouched; + _window = Window.Instance; + _window.BackgroundColor = Color.White; + _window.Touch += OnWindowTouched; // Add a _text label to the stage _text = new TextLabel("Hello Mono World"); @@ -49,7 +49,7 @@ namespace MyCSharpExample _text.HorizontalAlignment = "CENTER"; _text.PointSize = 32.0f; _text.TextColor = Color.Magenta; - _stage.Add(_text); + _window.Add(_text); _animation = new Animation { @@ -95,8 +95,8 @@ namespace MyCSharpExample } } - // Callback for stage touched signal handling - public void OnStageTouched(object sender, Stage.TouchEventArgs e) + // Callback for window touched signal handling + public void OnWindowTouched(object sender, Window.TouchEventArgs e) { // Only animate the _text label when touch down happens if (e.Touch.GetState(0) == PointStateType.DOWN) diff --git a/plugins/dali-sharp/examples/image-view.cs b/plugins/dali-sharp/examples/image-view.cs index 6ece63b..85c568d 100755 --- a/plugins/dali-sharp/examples/image-view.cs +++ b/plugins/dali-sharp/examples/image-view.cs @@ -35,7 +35,7 @@ namespace ImageViewExample private bool _isAniFinised = true; private Layer layer, _layer1, _layer2; private PushButton _pushButton1, _pushButton2; - private Stage stage; + private Window window; public Example(Dali.Application application) { @@ -46,25 +46,25 @@ namespace ImageViewExample public void Initialize(object source, NUIApplicationInitEventArgs e) { Log("Customized Application Initialize event handler"); - stage = Stage.Instance; - stage.BackgroundColor = Color.Cyan; - stage.Touch += OnStageTouched; - stage.Wheel += OnStageWheelMoved; - stage.Key += OnStageKeyPressed; - //stage.EventProcessingFinished += OnStageEventProcessingFinished; - - layer = stage.GetDefaultLayer(); + window = Window.Instance; + window.BackgroundColor = Color.Cyan; + window.Touch += OnWindowTouched; + window.Wheel += OnWindowWheelMoved; + window.Key += OnWindowKeyPressed; + //window.EventProcessingFinished += OnWindowEventProcessingFinished; + + layer = window.GetDefaultLayer(); _layer1 = new Layer(); _layer2 = new Layer(); - stage.AddLayer(_layer1); - stage.AddLayer(_layer2); + window.Add(_layer1); + window.Add(_layer2); Log("_layer1.Behavior =" + _layer1.Behavior); if (_layer1.Behavior == Layer.LayerBehavior.LAYER_UI) { _layer1.Behavior = Layer.LayerBehavior.LAYER_2D; Log("again _layer1.Behavior =" + _layer1.Behavior); } - // Add a ImageView to the stage + // Add a ImageView to the window _imageView = new ImageView(); _imageView.ResourceUrl = "./images/gallery-3.jpg"; _imageView.ParentOrigin = ParentOrigin.Center; @@ -77,7 +77,7 @@ namespace ImageViewExample _pushButton1.ParentOrigin = ParentOrigin.BottomLeft; _pushButton1.AnchorPoint = AnchorPoint.BottomLeft; _pushButton1.LabelText = "start animation"; - _pushButton1.Position = new Vector3(0.0f, stage.Size.Height * 0.1f, 0.0f); + _pushButton1.Position = new Vector3(0.0f, window.Size.Height * 0.1f, 0.0f); _pushButton1.Clicked += OnPushButtonClicked1; _layer1.Add(_pushButton1); @@ -85,7 +85,7 @@ namespace ImageViewExample _pushButton2.ParentOrigin = ParentOrigin.BottomLeft; _pushButton2.AnchorPoint = AnchorPoint.BottomLeft; _pushButton2.LabelText = "reload image with same URL"; - _pushButton2.Position = new Vector3(0.0f, stage.Size.Height * 0.2f, 0.0f); + _pushButton2.Position = new Vector3(0.0f, window.Size.Height * 0.2f, 0.0f); _pushButton2.Clicked += OnPushButtonClicked2; _layer2.Add(_pushButton2); @@ -154,8 +154,8 @@ namespace ImageViewExample _animation.TargetProperty = "Size"; KeyFrames _keyFrames = new KeyFrames(); _keyFrames.Add(0.0f, new Size(0.0f, 0.0f, 0.0f)); - _keyFrames.Add(0.3f, new Size((stage.Size * 0.7f))); - _keyFrames.Add(1.0f, new Size(stage.Size)); + _keyFrames.Add(0.3f, new Size((window.Size * 0.7f))); + _keyFrames.Add(1.0f, new Size(window.Size)); _animation.AnimateBetween(_imageView, _keyFrames, Animation.Interpolation.Linear); _animation.EndAction = Animation.EndActions.Discard; @@ -189,33 +189,33 @@ namespace ImageViewExample } } - public void OnStageEventProcessingFinished(object sender, EventArgs e) + public void OnWindowEventProcessingFinished(object sender, EventArgs e) { - Log("OnStageEventProcessingFinished()!"); + Log("OnWindowEventProcessingFinished()!"); if (e != null) { Log("e != null !"); } } - public void OnStageKeyPressed(object sender, Stage.KeyEventArgs e) + public void OnWindowKeyPressed(object sender, Window.KeyEventArgs e) { - Log("OnStageKeyEventOccured()!"); + Log("OnWindowKeyEventOccured()!"); Log("keyPressedName=" + e.Key.KeyPressedName); Log("state=" + e.Key.State); } - public void OnStageWheelMoved(object sender, Stage.WheelEventArgs e) + public void OnWindowWheelMoved(object sender, Window.WheelEventArgs e) { - Log("OnStageWheelEventOccured()!"); + Log("OnWindowWheelEventOccured()!"); Log("direction=" + e.Wheel.Direction); Log("type=" + e.Wheel.Type); } - // Callback for stage touched signal handling - public void OnStageTouched(object sender, Stage.TouchEventArgs e) + // Callback for window touched signal handling + public void OnWindowTouched(object sender, Window.TouchEventArgs e) { - Log("OnStageTouched()! e.TouchData.GetState(0)=" + e.Touch.GetState(0)); + Log("OnWindowTouched()! e.TouchData.GetState(0)=" + e.Touch.GetState(0)); } public void MainLoop() diff --git a/plugins/dali-sharp/examples/scroll-view.cs b/plugins/dali-sharp/examples/scroll-view.cs index a1964c7..3199857 100755 --- a/plugins/dali-sharp/examples/scroll-view.cs +++ b/plugins/dali-sharp/examples/scroll-view.cs @@ -42,16 +42,16 @@ namespace MyCSharpExample private void CreateScrollView() { - Stage stage = Stage.GetCurrent(); - stage.BackgroundColor = Color.White; + Window window = Window.Instance; + window.BackgroundColor = Color.White; // Create a scroll view _scrollView = new ScrollView(); - Size2D stageSize = stage.Size; - _scrollView.Size = new Position(stageSize.Width, stageSize.Height, 0.0f); + Size2D windowSize = window.Size; + _scrollView.Size = new Position(windowSize.Width, windowSize.Height, 0.0f); _scrollView.ParentOrigin = NDalic.ParentOriginCenter; _scrollView.AnchorPoint = NDalic.AnchorPointCenter; - stage.Add(_scrollView); + window.Add(_scrollView); // Add actors to a scroll view with 3 pages int pageRows = 1; @@ -64,13 +64,13 @@ namespace MyCSharpExample pageActor.SetResizePolicy(ResizePolicyType.FILL_TO_PARENT, DimensionType.ALL_DIMENSIONS); pageActor.ParentOrigin = NDalic.ParentOriginCenter; pageActor.AnchorPoint = NDalic.AnchorPointCenter; - pageActor.Position = new Position(pageColumn * stageSize.Width, pageRow * stageSize.Height, 0.0f); + pageActor.Position = new Position(pageColumn * windowSize.Width, pageRow * windowSize.Height, 0.0f); // Add images in a 3x4 grid layout for each page int imageRows = 4; int imageColumns = 3; float margin = 10.0f; - Position imageSize = new Position((stageSize.Width / imageColumns) - margin, (stageSize.Height / imageRows) - margin, 0.0f); + Position imageSize = new Position((windowSize.Width / imageColumns) - margin, (windowSize.Height / imageRows) - margin, 0.0f); for (int row = 0; row < imageRows; row++) { @@ -81,8 +81,8 @@ namespace MyCSharpExample imageView.ParentOrigin = NDalic.ParentOriginCenter; imageView.AnchorPoint = NDalic.AnchorPointCenter; imageView.Size = imageSize; - imageView.Position = new Position(margin * 0.5f + (imageSize.X + margin) * column - stageSize.Width * 0.5f + imageSize.X * 0.5f, - margin * 0.5f + (imageSize.Y + margin) * row - stageSize.Height * 0.5f + imageSize.Y * 0.5f, 0.0f); + imageView.Position = new Position(margin * 0.5f + (imageSize.X + margin) * column - windowSize.Width * 0.5f + imageSize.X * 0.5f, + margin * 0.5f + (imageSize.Y + margin) * row - windowSize.Height * 0.5f + imageSize.Y * 0.5f, 0.0f); pageActor.Add(imageView); } } @@ -95,9 +95,9 @@ namespace MyCSharpExample // Set scroll view to have 3 pages in X axis and allow page snapping, // and also disable scrolling in Y axis. - RulerPtr scrollRulerX = new RulerPtr(new FixedRuler(stageSize.Width)); + RulerPtr scrollRulerX = new RulerPtr(new FixedRuler(windowSize.Width)); RulerPtr scrollRulerY = new RulerPtr(new DefaultRuler()); - scrollRulerX.SetDomain(new RulerDomain(0.0f, stageSize.Width * pageColumns, true)); + scrollRulerX.SetDomain(new RulerDomain(0.0f, windowSize.Width * pageColumns, true)); scrollRulerY.Disable(); _scrollView.SetRulerX(scrollRulerX); _scrollView.SetRulerY(scrollRulerY); @@ -149,7 +149,7 @@ namespace MyCSharpExample // Only animate the _text label when touch down happens if (e.Touch.GetState(0) == PointStateType.DOWN) { - Console.WriteLine("Customized Stage Touch event handler"); + Console.WriteLine("Customized Window Touch event handler"); // Create a new _animation if (_animation) { diff --git a/plugins/dali-sharp/examples/user-alphafunction.cs b/plugins/dali-sharp/examples/user-alphafunction.cs index 40415f9..a55fd4a 100755 --- a/plugins/dali-sharp/examples/user-alphafunction.cs +++ b/plugins/dali-sharp/examples/user-alphafunction.cs @@ -48,19 +48,19 @@ namespace MyCSharpExample public void Initialize(object source, NUIApplicationInitEventArgs e) { Log("Initialize() is called!"); - Stage stage = Stage.GetCurrent(); - stage.BackgroundColor = Color.White; - stage.Touch += OnStageTouched; - stage.Touch += OnStageTouched2; - stage.Wheel += OnStageWheelEvent; + Window window = Window.Instance; + window.BackgroundColor = Color.White; + window.Touch += OnWindowTouched; + window.Touch += OnWindowTouched2; + window.Wheel += OnWindowWheelEvent; - // Add a _text label to the stage + // Add a _text label to the window _text = new TextLabel("Hello Mono World"); _text.ParentOrigin = ParentOrigin.BottomCenter; _text.AnchorPoint = AnchorPoint.BottomCenter; _text.HorizontalAlignment = "CENTER"; _text.PointSize = 32.0f; - stage.Add(_text); + window.Add(_text); _view1 = new View(); _view1.Size = new Vector3(200.0f, 200.0f, 0.0f); @@ -68,8 +68,8 @@ namespace MyCSharpExample _view1.ParentOrigin = ParentOrigin.Center; _view1.AnchorPoint = AnchorPoint.Center; _view1.SetResizePolicy(ResizePolicyType.FIXED, DimensionType.ALL_DIMENSIONS); - _view1.OnStageEvent += OnStage; - stage.Add(_view1); + _view1.OnWindowEvent += OnWindow; + window.Add(_view1); _view2 = new View(); _view2.BackgroundColor = Color.Red; @@ -136,13 +136,13 @@ namespace MyCSharpExample _animation.Play(); } - // Callback for stage touched signal handling - public void OnStageTouched(object source, Stage.TouchEventArgs e) + // Callback for window touched signal handling + public void OnWindowTouched(object source, Window.TouchEventArgs e) { // Only animate the _text label when touch down happens if (e.Touch.GetState(0) == PointStateType.DOWN) { - Log("OnStageTouched() is called! PointStateType.DOWN came!"); + Log("OnWindowTouched() is called! PointStateType.DOWN came!"); myCount++; if (myCount > 1) { @@ -152,10 +152,10 @@ namespace MyCSharpExample } } - // Callback for stage touched signal handling - public void OnStageTouched2(object source, Stage.TouchEventArgs e) + // Callback for window touched signal handling + public void OnWindowTouched2(object source, Window.TouchEventArgs e) { - Log("OnStageTouched2() is called!state=" + e.Touch.GetState(0)); + Log("OnWindowTouched2() is called!state=" + e.Touch.GetState(0)); } public void OnEventProcessingFinished(object source) @@ -163,15 +163,15 @@ namespace MyCSharpExample Log("OnEventProcessingFinished() is called!"); } - public void OnStageWheelEvent(object source, Stage.WheelEventArgs e) + public void OnWindowWheelEvent(object source, Window.WheelEventArgs e) { - Log("OnStageWheelEvent() is called!"); + Log("OnWindowWheelEvent() is called!"); } - public void OnStage(object source, View.OnStageEventArgs e) + public void OnWindow(object source, View.OnWindowEventArgs e) { - Log("OnStage() is called!"); + Log("OnWindow() is called!"); } public void MainLoop() diff --git a/plugins/dali-sharp/examples/visuals-example.cs b/plugins/dali-sharp/examples/visuals-example.cs index 51c57d9..f3b21ea 100755 --- a/plugins/dali-sharp/examples/visuals-example.cs +++ b/plugins/dali-sharp/examples/visuals-example.cs @@ -34,8 +34,8 @@ namespace MyCSharpExample public void Initialize(object source, NUIApplicationInitEventArgs e) { - Stage stage = Stage.Instance; - stage.BackgroundColor = Color.White; + Window window = Window.Instance; + window.BackgroundColor = Color.White; TableView contentLayout = new TableView(4, 1); contentLayout.Name = ("ContentLayout"); @@ -44,7 +44,7 @@ namespace MyCSharpExample contentLayout.SetCellPadding(new Size2D(0, 5)); contentLayout.BackgroundColor = new Color(0.949f, 0.949f, 0.949f, 1.0f); - stage.GetDefaultLayer().Add(contentLayout); + window.GetDefaultLayer().Add(contentLayout); _title = new TextLabel("Visuals Example"); _title.Name = "Title"; diff --git a/plugins/dali-sharp/examples/visuals-using-custom-view/visuals-using-custom-view.cs b/plugins/dali-sharp/examples/visuals-using-custom-view/visuals-using-custom-view.cs index 8762974..a77417a 100755 --- a/plugins/dali-sharp/examples/visuals-using-custom-view/visuals-using-custom-view.cs +++ b/plugins/dali-sharp/examples/visuals-using-custom-view/visuals-using-custom-view.cs @@ -30,8 +30,8 @@ namespace VisualsUsingCustomView private void Initialize(object source, NUIApplicationInitEventArgs e) { - Stage stage = Stage.Instance; - stage.BackgroundColor = Color.White; + Window window = Window.Instance; + window.BackgroundColor = Color.White; TableView contentLayout = new TableView(14, 1); contentLayout.Name = "ContentLayout"; @@ -40,7 +40,7 @@ namespace VisualsUsingCustomView contentLayout.SetCellPadding(new Size2D(5, 5)); contentLayout.BackgroundColor = new Color(0.949f, 0.949f, 0.949f, 1.0f); - stage.GetDefaultLayer().Add(contentLayout); + window.GetDefaultLayer().Add(contentLayout); TextLabel title = new TextLabel("Contacts List with Visuals"); title.Name = "Title"; diff --git a/plugins/dali-sharp/sharp/internal/AccessibilityActionSignal.cs b/plugins/dali-sharp/sharp/internal/AccessibilityActionSignal.cs index 273ee85..68cfaa8 100644 --- a/plugins/dali-sharp/sharp/internal/AccessibilityActionSignal.cs +++ b/plugins/dali-sharp/sharp/internal/AccessibilityActionSignal.cs @@ -28,7 +28,7 @@ public class AccessibilityActionSignal : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/AccessibilityFocusOvershotSignal.cs b/plugins/dali-sharp/sharp/internal/AccessibilityFocusOvershotSignal.cs index e3ceeaf..a038c90 100644 --- a/plugins/dali-sharp/sharp/internal/AccessibilityFocusOvershotSignal.cs +++ b/plugins/dali-sharp/sharp/internal/AccessibilityFocusOvershotSignal.cs @@ -28,7 +28,7 @@ public class AccessibilityFocusOvershotSignal : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/AccessibilityManager.cs b/plugins/dali-sharp/sharp/internal/AccessibilityManager.cs index 45f1f5e..a0613a2 100644 --- a/plugins/dali-sharp/sharp/internal/AccessibilityManager.cs +++ b/plugins/dali-sharp/sharp/internal/AccessibilityManager.cs @@ -29,7 +29,7 @@ public class AccessibilityManager : BaseHandle { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/Alignment.cs b/plugins/dali-sharp/sharp/internal/Alignment.cs index e2567e0..5b3b000 100644 --- a/plugins/dali-sharp/sharp/internal/Alignment.cs +++ b/plugins/dali-sharp/sharp/internal/Alignment.cs @@ -42,7 +42,7 @@ internal class Alignment : View { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/AlphaFunction.cs b/plugins/dali-sharp/sharp/internal/AlphaFunction.cs index cafca8d..de08a1e 100644 --- a/plugins/dali-sharp/sharp/internal/AlphaFunction.cs +++ b/plugins/dali-sharp/sharp/internal/AlphaFunction.cs @@ -28,7 +28,7 @@ public class AlphaFunction : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/AngleAxis.cs b/plugins/dali-sharp/sharp/internal/AngleAxis.cs index 2da0c64..ca51c8d 100644 --- a/plugins/dali-sharp/sharp/internal/AngleAxis.cs +++ b/plugins/dali-sharp/sharp/internal/AngleAxis.cs @@ -28,7 +28,7 @@ public class AngleAxis : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/Animatable.cs b/plugins/dali-sharp/sharp/internal/Animatable.cs index e193d4a..95d7e3b 100644 --- a/plugins/dali-sharp/sharp/internal/Animatable.cs +++ b/plugins/dali-sharp/sharp/internal/Animatable.cs @@ -32,7 +32,7 @@ public class Animatable : BaseHandle { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/AnimatablePropertyComponentRegistration.cs b/plugins/dali-sharp/sharp/internal/AnimatablePropertyComponentRegistration.cs index 4132ae1..7c328f0 100644 --- a/plugins/dali-sharp/sharp/internal/AnimatablePropertyComponentRegistration.cs +++ b/plugins/dali-sharp/sharp/internal/AnimatablePropertyComponentRegistration.cs @@ -28,7 +28,7 @@ public class AnimatablePropertyComponentRegistration : global::System.IDisposabl } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/AnimatablePropertyRegistration.cs b/plugins/dali-sharp/sharp/internal/AnimatablePropertyRegistration.cs index a3f9f85..f617343 100644 --- a/plugins/dali-sharp/sharp/internal/AnimatablePropertyRegistration.cs +++ b/plugins/dali-sharp/sharp/internal/AnimatablePropertyRegistration.cs @@ -28,7 +28,7 @@ public class AnimatablePropertyRegistration : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/Animation.cs b/plugins/dali-sharp/sharp/internal/Animation.cs index 8cb9407..6eb45fb 100644 --- a/plugins/dali-sharp/sharp/internal/Animation.cs +++ b/plugins/dali-sharp/sharp/internal/Animation.cs @@ -51,7 +51,7 @@ namespace Dali public override void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; diff --git a/plugins/dali-sharp/sharp/internal/AnimationSignal.cs b/plugins/dali-sharp/sharp/internal/AnimationSignal.cs index 5e3d5a5..c558d96 100644 --- a/plugins/dali-sharp/sharp/internal/AnimationSignal.cs +++ b/plugins/dali-sharp/sharp/internal/AnimationSignal.cs @@ -28,7 +28,7 @@ public class AnimationSignal : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/Any.cs b/plugins/dali-sharp/sharp/internal/Any.cs index b60b9f9..99207f0 100644 --- a/plugins/dali-sharp/sharp/internal/Any.cs +++ b/plugins/dali-sharp/sharp/internal/Any.cs @@ -28,7 +28,7 @@ public class Any : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/Application.cs b/plugins/dali-sharp/sharp/internal/Application.cs index ad3c0be..d07c886 100644 --- a/plugins/dali-sharp/sharp/internal/Application.cs +++ b/plugins/dali-sharp/sharp/internal/Application.cs @@ -310,7 +310,7 @@ public class Application : BaseHandle { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/ApplicationControlSignal.cs b/plugins/dali-sharp/sharp/internal/ApplicationControlSignal.cs index 1a246aa..bc88f61 100644 --- a/plugins/dali-sharp/sharp/internal/ApplicationControlSignal.cs +++ b/plugins/dali-sharp/sharp/internal/ApplicationControlSignal.cs @@ -28,7 +28,7 @@ public class ApplicationControlSignal : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/ApplicationExtensions.cs b/plugins/dali-sharp/sharp/internal/ApplicationExtensions.cs index 611f6e7..22dd82a 100644 --- a/plugins/dali-sharp/sharp/internal/ApplicationExtensions.cs +++ b/plugins/dali-sharp/sharp/internal/ApplicationExtensions.cs @@ -28,7 +28,7 @@ public class ApplicationExtensions : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/ApplicationSignal.cs b/plugins/dali-sharp/sharp/internal/ApplicationSignal.cs index 902281f..17d0925 100644 --- a/plugins/dali-sharp/sharp/internal/ApplicationSignal.cs +++ b/plugins/dali-sharp/sharp/internal/ApplicationSignal.cs @@ -28,7 +28,7 @@ public class ApplicationSignal : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/AsyncImageLoader.cs b/plugins/dali-sharp/sharp/internal/AsyncImageLoader.cs index b411cf1..c54428e 100644 --- a/plugins/dali-sharp/sharp/internal/AsyncImageLoader.cs +++ b/plugins/dali-sharp/sharp/internal/AsyncImageLoader.cs @@ -42,7 +42,7 @@ public class AsyncImageLoader : BaseHandle { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/BaseHandle.cs b/plugins/dali-sharp/sharp/internal/BaseHandle.cs index d571764..8420649 100644 --- a/plugins/dali-sharp/sharp/internal/BaseHandle.cs +++ b/plugins/dali-sharp/sharp/internal/BaseHandle.cs @@ -28,7 +28,7 @@ public class BaseHandle : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/BufferImage.cs b/plugins/dali-sharp/sharp/internal/BufferImage.cs index dc825f5..d93efb4 100644 --- a/plugins/dali-sharp/sharp/internal/BufferImage.cs +++ b/plugins/dali-sharp/sharp/internal/BufferImage.cs @@ -42,7 +42,7 @@ public class BufferImage : Image { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/Builder.cs b/plugins/dali-sharp/sharp/internal/Builder.cs index 9730348..1eeb9e8 100644 --- a/plugins/dali-sharp/sharp/internal/Builder.cs +++ b/plugins/dali-sharp/sharp/internal/Builder.cs @@ -46,7 +46,7 @@ public class Builder : BaseHandle { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/Button.cs b/plugins/dali-sharp/sharp/internal/Button.cs index d9767f6..d785260 100644 --- a/plugins/dali-sharp/sharp/internal/Button.cs +++ b/plugins/dali-sharp/sharp/internal/Button.cs @@ -30,7 +30,7 @@ public class Button : View { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/ButtonSignal.cs b/plugins/dali-sharp/sharp/internal/ButtonSignal.cs index eb90e3c..cd19677 100644 --- a/plugins/dali-sharp/sharp/internal/ButtonSignal.cs +++ b/plugins/dali-sharp/sharp/internal/ButtonSignal.cs @@ -28,7 +28,7 @@ public class ButtonSignal : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/Camera.cs b/plugins/dali-sharp/sharp/internal/Camera.cs index aea33d4..4b05430 100644 --- a/plugins/dali-sharp/sharp/internal/Camera.cs +++ b/plugins/dali-sharp/sharp/internal/Camera.cs @@ -42,7 +42,7 @@ namespace Dali { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/CheckBoxButton.cs b/plugins/dali-sharp/sharp/internal/CheckBoxButton.cs index 0d5dfda..289d059 100644 --- a/plugins/dali-sharp/sharp/internal/CheckBoxButton.cs +++ b/plugins/dali-sharp/sharp/internal/CheckBoxButton.cs @@ -42,7 +42,7 @@ public class CheckBoxButton : Button { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/ChildPropertyRegistration.cs b/plugins/dali-sharp/sharp/internal/ChildPropertyRegistration.cs index 3091aac..527ff1c 100644 --- a/plugins/dali-sharp/sharp/internal/ChildPropertyRegistration.cs +++ b/plugins/dali-sharp/sharp/internal/ChildPropertyRegistration.cs @@ -28,7 +28,7 @@ public class ChildPropertyRegistration : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/ClampState2D.cs b/plugins/dali-sharp/sharp/internal/ClampState2D.cs index 44f3163..ea62e9a 100644 --- a/plugins/dali-sharp/sharp/internal/ClampState2D.cs +++ b/plugins/dali-sharp/sharp/internal/ClampState2D.cs @@ -28,7 +28,7 @@ public class ClampState2D : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/Color.cs b/plugins/dali-sharp/sharp/internal/Color.cs index ca0dd01..6b1c59a 100755 --- a/plugins/dali-sharp/sharp/internal/Color.cs +++ b/plugins/dali-sharp/sharp/internal/Color.cs @@ -37,7 +37,7 @@ public class Color : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/ConnectionTracker.cs b/plugins/dali-sharp/sharp/internal/ConnectionTracker.cs index e167ae9..e87416a 100644 --- a/plugins/dali-sharp/sharp/internal/ConnectionTracker.cs +++ b/plugins/dali-sharp/sharp/internal/ConnectionTracker.cs @@ -26,7 +26,7 @@ public class ConnectionTracker : ConnectionTrackerInterface { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/ConnectionTrackerInterface.cs b/plugins/dali-sharp/sharp/internal/ConnectionTrackerInterface.cs index cfc92a4..9f6ec66 100644 --- a/plugins/dali-sharp/sharp/internal/ConnectionTrackerInterface.cs +++ b/plugins/dali-sharp/sharp/internal/ConnectionTrackerInterface.cs @@ -26,7 +26,7 @@ public class ConnectionTrackerInterface : SignalObserver { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/ControlKeySignal.cs b/plugins/dali-sharp/sharp/internal/ControlKeySignal.cs index 95bf65d..c0138e6 100644 --- a/plugins/dali-sharp/sharp/internal/ControlKeySignal.cs +++ b/plugins/dali-sharp/sharp/internal/ControlKeySignal.cs @@ -28,7 +28,7 @@ public class ControlKeySignal : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/CustomActor.cs b/plugins/dali-sharp/sharp/internal/CustomActor.cs index e1da6fa..86b873a 100644 --- a/plugins/dali-sharp/sharp/internal/CustomActor.cs +++ b/plugins/dali-sharp/sharp/internal/CustomActor.cs @@ -26,7 +26,7 @@ namespace Dali { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/CustomAlgorithmInterface.cs b/plugins/dali-sharp/sharp/internal/CustomAlgorithmInterface.cs index 34b8a2c..aaf13e3 100644 --- a/plugins/dali-sharp/sharp/internal/CustomAlgorithmInterface.cs +++ b/plugins/dali-sharp/sharp/internal/CustomAlgorithmInterface.cs @@ -28,7 +28,7 @@ public class CustomAlgorithmInterface : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/DaliException.cs b/plugins/dali-sharp/sharp/internal/DaliException.cs index bcad280..3160ef9 100644 --- a/plugins/dali-sharp/sharp/internal/DaliException.cs +++ b/plugins/dali-sharp/sharp/internal/DaliException.cs @@ -28,7 +28,7 @@ public class DaliException : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/Degree.cs b/plugins/dali-sharp/sharp/internal/Degree.cs index 865fcf5..c47993c 100644 --- a/plugins/dali-sharp/sharp/internal/Degree.cs +++ b/plugins/dali-sharp/sharp/internal/Degree.cs @@ -28,7 +28,7 @@ public class Degree : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/DragAndDropDetector.cs b/plugins/dali-sharp/sharp/internal/DragAndDropDetector.cs index a349deb..db7c9f9 100644 --- a/plugins/dali-sharp/sharp/internal/DragAndDropDetector.cs +++ b/plugins/dali-sharp/sharp/internal/DragAndDropDetector.cs @@ -26,7 +26,7 @@ public class DragAndDropDetector : BaseHandle { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/EncodedBufferImage.cs b/plugins/dali-sharp/sharp/internal/EncodedBufferImage.cs index 1933076..f178a25 100644 --- a/plugins/dali-sharp/sharp/internal/EncodedBufferImage.cs +++ b/plugins/dali-sharp/sharp/internal/EncodedBufferImage.cs @@ -42,7 +42,7 @@ public class EncodedBufferImage : Image { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/FlexContainer.cs b/plugins/dali-sharp/sharp/internal/FlexContainer.cs index a67cc28..902ed78 100644 --- a/plugins/dali-sharp/sharp/internal/FlexContainer.cs +++ b/plugins/dali-sharp/sharp/internal/FlexContainer.cs @@ -42,7 +42,7 @@ public class FlexContainer : View { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/FloatSignal.cs b/plugins/dali-sharp/sharp/internal/FloatSignal.cs index 6f028a7..7d5ba42 100644 --- a/plugins/dali-sharp/sharp/internal/FloatSignal.cs +++ b/plugins/dali-sharp/sharp/internal/FloatSignal.cs @@ -28,7 +28,7 @@ public class FloatSignal : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/FocusChangedSignal.cs b/plugins/dali-sharp/sharp/internal/FocusChangedSignal.cs index f234f4c..3304d26 100644 --- a/plugins/dali-sharp/sharp/internal/FocusChangedSignal.cs +++ b/plugins/dali-sharp/sharp/internal/FocusChangedSignal.cs @@ -28,7 +28,7 @@ public class FocusChangedSignal : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/FocusGroupChangedSignal.cs b/plugins/dali-sharp/sharp/internal/FocusGroupChangedSignal.cs index 72764bd..43494c2 100644 --- a/plugins/dali-sharp/sharp/internal/FocusGroupChangedSignal.cs +++ b/plugins/dali-sharp/sharp/internal/FocusGroupChangedSignal.cs @@ -28,7 +28,7 @@ public class FocusGroupChangedSignal : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/FocusManager.cs b/plugins/dali-sharp/sharp/internal/FocusManager.cs index 78972d8..2189b55 100755 --- a/plugins/dali-sharp/sharp/internal/FocusManager.cs +++ b/plugins/dali-sharp/sharp/internal/FocusManager.cs @@ -37,7 +37,7 @@ public class FocusManager : BaseHandle { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/FrameBuffer.cs b/plugins/dali-sharp/sharp/internal/FrameBuffer.cs index c7ec931..41e6c35 100644 --- a/plugins/dali-sharp/sharp/internal/FrameBuffer.cs +++ b/plugins/dali-sharp/sharp/internal/FrameBuffer.cs @@ -42,7 +42,7 @@ public class FrameBuffer : BaseHandle { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/FrameBufferImage.cs b/plugins/dali-sharp/sharp/internal/FrameBufferImage.cs index 61a2854..c7b428c 100644 --- a/plugins/dali-sharp/sharp/internal/FrameBufferImage.cs +++ b/plugins/dali-sharp/sharp/internal/FrameBufferImage.cs @@ -42,7 +42,7 @@ public class FrameBufferImage : Image { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/GaussianBlurView.cs b/plugins/dali-sharp/sharp/internal/GaussianBlurView.cs index 77bb64d..5f0ce58 100644 --- a/plugins/dali-sharp/sharp/internal/GaussianBlurView.cs +++ b/plugins/dali-sharp/sharp/internal/GaussianBlurView.cs @@ -46,7 +46,7 @@ public class GaussianBlurView : View { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/GaussianBlurViewSignal.cs b/plugins/dali-sharp/sharp/internal/GaussianBlurViewSignal.cs index cd6b06f..8fe1248 100644 --- a/plugins/dali-sharp/sharp/internal/GaussianBlurViewSignal.cs +++ b/plugins/dali-sharp/sharp/internal/GaussianBlurViewSignal.cs @@ -28,7 +28,7 @@ public class GaussianBlurViewSignal : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/Geometry.cs b/plugins/dali-sharp/sharp/internal/Geometry.cs index c43b024..69b0ddf 100644 --- a/plugins/dali-sharp/sharp/internal/Geometry.cs +++ b/plugins/dali-sharp/sharp/internal/Geometry.cs @@ -42,7 +42,7 @@ public class Geometry : BaseHandle { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/Gesture.cs b/plugins/dali-sharp/sharp/internal/Gesture.cs index dfe94ac..48ba55e 100644 --- a/plugins/dali-sharp/sharp/internal/Gesture.cs +++ b/plugins/dali-sharp/sharp/internal/Gesture.cs @@ -28,7 +28,7 @@ public class Gesture : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/GestureDetector.cs b/plugins/dali-sharp/sharp/internal/GestureDetector.cs index 27358d0..ef20276 100644 --- a/plugins/dali-sharp/sharp/internal/GestureDetector.cs +++ b/plugins/dali-sharp/sharp/internal/GestureDetector.cs @@ -26,7 +26,7 @@ public class GestureDetector : BaseHandle { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/Hover.cs b/plugins/dali-sharp/sharp/internal/Hover.cs index 5c81e7c..1e1d58c 100644 --- a/plugins/dali-sharp/sharp/internal/Hover.cs +++ b/plugins/dali-sharp/sharp/internal/Hover.cs @@ -28,7 +28,7 @@ public class Hover : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/HoverSignal.cs b/plugins/dali-sharp/sharp/internal/HoverSignal.cs index 1623fab..417ef26 100644 --- a/plugins/dali-sharp/sharp/internal/HoverSignal.cs +++ b/plugins/dali-sharp/sharp/internal/HoverSignal.cs @@ -28,7 +28,7 @@ internal class HoverSignal : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/Image.cs b/plugins/dali-sharp/sharp/internal/Image.cs index 9f8f0a7..8dc5ca6 100644 --- a/plugins/dali-sharp/sharp/internal/Image.cs +++ b/plugins/dali-sharp/sharp/internal/Image.cs @@ -30,7 +30,7 @@ public class Image : BaseHandle { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/ImageSignal.cs b/plugins/dali-sharp/sharp/internal/ImageSignal.cs index 19d8896..47f7247 100644 --- a/plugins/dali-sharp/sharp/internal/ImageSignal.cs +++ b/plugins/dali-sharp/sharp/internal/ImageSignal.cs @@ -28,7 +28,7 @@ public class ImageSignal : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/ImageView.cs b/plugins/dali-sharp/sharp/internal/ImageView.cs index 8b9db52..a4e645e 100644 --- a/plugins/dali-sharp/sharp/internal/ImageView.cs +++ b/plugins/dali-sharp/sharp/internal/ImageView.cs @@ -42,7 +42,7 @@ public class ImageView : View { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/ItemFactory.cs b/plugins/dali-sharp/sharp/internal/ItemFactory.cs index 774b7c9..d0c0163 100644 --- a/plugins/dali-sharp/sharp/internal/ItemFactory.cs +++ b/plugins/dali-sharp/sharp/internal/ItemFactory.cs @@ -28,7 +28,7 @@ public class ItemFactory : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/ItemIdContainer.cs b/plugins/dali-sharp/sharp/internal/ItemIdContainer.cs index 17a5cb4..9c98bd8 100644 --- a/plugins/dali-sharp/sharp/internal/ItemIdContainer.cs +++ b/plugins/dali-sharp/sharp/internal/ItemIdContainer.cs @@ -30,7 +30,7 @@ public class ItemIdContainer : global::System.IDisposable, global::System.Collec } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/ItemLayout.cs b/plugins/dali-sharp/sharp/internal/ItemLayout.cs index eb2c508..735efce 100644 --- a/plugins/dali-sharp/sharp/internal/ItemLayout.cs +++ b/plugins/dali-sharp/sharp/internal/ItemLayout.cs @@ -26,7 +26,7 @@ public class ItemLayout : RefObject { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/ItemRange.cs b/plugins/dali-sharp/sharp/internal/ItemRange.cs index c6df63f..fe82cf4 100644 --- a/plugins/dali-sharp/sharp/internal/ItemRange.cs +++ b/plugins/dali-sharp/sharp/internal/ItemRange.cs @@ -28,7 +28,7 @@ public class ItemRange : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/ItemView.cs b/plugins/dali-sharp/sharp/internal/ItemView.cs index fc6ec56..5c791df 100644 --- a/plugins/dali-sharp/sharp/internal/ItemView.cs +++ b/plugins/dali-sharp/sharp/internal/ItemView.cs @@ -46,7 +46,7 @@ public class ItemView : Scrollable { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/Key.cs b/plugins/dali-sharp/sharp/internal/Key.cs index 05e6a62..813c64c 100644 --- a/plugins/dali-sharp/sharp/internal/Key.cs +++ b/plugins/dali-sharp/sharp/internal/Key.cs @@ -28,7 +28,7 @@ public class Key : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/KeyEventSignal.cs b/plugins/dali-sharp/sharp/internal/KeyEventSignal.cs index 9396ac0..79109ad 100644 --- a/plugins/dali-sharp/sharp/internal/KeyEventSignal.cs +++ b/plugins/dali-sharp/sharp/internal/KeyEventSignal.cs @@ -28,7 +28,7 @@ public class KeyEventSignal : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/KeyFrames.cs b/plugins/dali-sharp/sharp/internal/KeyFrames.cs index 1c443d1..9c45f3b 100644 --- a/plugins/dali-sharp/sharp/internal/KeyFrames.cs +++ b/plugins/dali-sharp/sharp/internal/KeyFrames.cs @@ -42,7 +42,7 @@ public class KeyFrames : BaseHandle { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/KeyInputFocusSignal.cs b/plugins/dali-sharp/sharp/internal/KeyInputFocusSignal.cs index 82a16ed..08670d2 100644 --- a/plugins/dali-sharp/sharp/internal/KeyInputFocusSignal.cs +++ b/plugins/dali-sharp/sharp/internal/KeyInputFocusSignal.cs @@ -28,7 +28,7 @@ public class KeyInputFocusSignal : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/KeyboardPreFocusChangeSignal.cs b/plugins/dali-sharp/sharp/internal/KeyboardPreFocusChangeSignal.cs index 278b4a6..4ef8cd6 100755 --- a/plugins/dali-sharp/sharp/internal/KeyboardPreFocusChangeSignal.cs +++ b/plugins/dali-sharp/sharp/internal/KeyboardPreFocusChangeSignal.cs @@ -39,7 +39,7 @@ public class PreFocusChangeSignal : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/Layer.cs b/plugins/dali-sharp/sharp/internal/Layer.cs index 641f230..c32972c 100644 --- a/plugins/dali-sharp/sharp/internal/Layer.cs +++ b/plugins/dali-sharp/sharp/internal/Layer.cs @@ -38,7 +38,7 @@ namespace Dali public virtual void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; diff --git a/plugins/dali-sharp/sharp/internal/LinearConstrainer.cs b/plugins/dali-sharp/sharp/internal/LinearConstrainer.cs index a153e75..61657d6 100644 --- a/plugins/dali-sharp/sharp/internal/LinearConstrainer.cs +++ b/plugins/dali-sharp/sharp/internal/LinearConstrainer.cs @@ -42,7 +42,7 @@ public class LinearConstrainer : BaseHandle { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/LongPressGesture.cs b/plugins/dali-sharp/sharp/internal/LongPressGesture.cs index 0cf5a58..2cd44ee 100644 --- a/plugins/dali-sharp/sharp/internal/LongPressGesture.cs +++ b/plugins/dali-sharp/sharp/internal/LongPressGesture.cs @@ -26,7 +26,7 @@ public class LongPressGesture : Gesture { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/LongPressGestureDetectedSignal.cs b/plugins/dali-sharp/sharp/internal/LongPressGestureDetectedSignal.cs index 5f5dcc5..f4c4ecd 100644 --- a/plugins/dali-sharp/sharp/internal/LongPressGestureDetectedSignal.cs +++ b/plugins/dali-sharp/sharp/internal/LongPressGestureDetectedSignal.cs @@ -28,7 +28,7 @@ public class LongPressGestureDetectedSignal : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/LongPressGestureDetector.cs b/plugins/dali-sharp/sharp/internal/LongPressGestureDetector.cs index d4a5256..7eb839e 100644 --- a/plugins/dali-sharp/sharp/internal/LongPressGestureDetector.cs +++ b/plugins/dali-sharp/sharp/internal/LongPressGestureDetector.cs @@ -45,7 +45,7 @@ public class LongPressGestureDetector : GestureDetector { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/Matrix.cs b/plugins/dali-sharp/sharp/internal/Matrix.cs index 5866995..a7c5c62 100644 --- a/plugins/dali-sharp/sharp/internal/Matrix.cs +++ b/plugins/dali-sharp/sharp/internal/Matrix.cs @@ -28,7 +28,7 @@ public class Matrix : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/Matrix3.cs b/plugins/dali-sharp/sharp/internal/Matrix3.cs index dfcb5a1..0b39649 100644 --- a/plugins/dali-sharp/sharp/internal/Matrix3.cs +++ b/plugins/dali-sharp/sharp/internal/Matrix3.cs @@ -28,7 +28,7 @@ public class Matrix3 : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/Model3dView.cs b/plugins/dali-sharp/sharp/internal/Model3dView.cs index c58d13a..c3eb6f6 100644 --- a/plugins/dali-sharp/sharp/internal/Model3dView.cs +++ b/plugins/dali-sharp/sharp/internal/Model3dView.cs @@ -42,7 +42,7 @@ public class Model3dView : View { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/NativeImage.cs b/plugins/dali-sharp/sharp/internal/NativeImage.cs index a432a9c..26ad622 100644 --- a/plugins/dali-sharp/sharp/internal/NativeImage.cs +++ b/plugins/dali-sharp/sharp/internal/NativeImage.cs @@ -42,7 +42,7 @@ public class NativeImage : Image { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/NinePatchImage.cs b/plugins/dali-sharp/sharp/internal/NinePatchImage.cs index 40a2083..1843d43 100644 --- a/plugins/dali-sharp/sharp/internal/NinePatchImage.cs +++ b/plugins/dali-sharp/sharp/internal/NinePatchImage.cs @@ -42,7 +42,7 @@ public class NinePatchImage : ResourceImage { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/ObjectCreatedSignal.cs b/plugins/dali-sharp/sharp/internal/ObjectCreatedSignal.cs index d9589e3..d8eee47 100644 --- a/plugins/dali-sharp/sharp/internal/ObjectCreatedSignal.cs +++ b/plugins/dali-sharp/sharp/internal/ObjectCreatedSignal.cs @@ -28,7 +28,7 @@ public class ObjectCreatedSignal : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/ObjectDestroyedSignal.cs b/plugins/dali-sharp/sharp/internal/ObjectDestroyedSignal.cs index 8238903..1437c55 100644 --- a/plugins/dali-sharp/sharp/internal/ObjectDestroyedSignal.cs +++ b/plugins/dali-sharp/sharp/internal/ObjectDestroyedSignal.cs @@ -28,7 +28,7 @@ public class ObjectDestroyedSignal : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/ObjectRegistry.cs b/plugins/dali-sharp/sharp/internal/ObjectRegistry.cs index 329bbd7..8342997 100644 --- a/plugins/dali-sharp/sharp/internal/ObjectRegistry.cs +++ b/plugins/dali-sharp/sharp/internal/ObjectRegistry.cs @@ -30,7 +30,7 @@ public class ObjectRegistry : BaseHandle { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/PaddingType.cs b/plugins/dali-sharp/sharp/internal/PaddingType.cs index 0a87974..a2ec812 100644 --- a/plugins/dali-sharp/sharp/internal/PaddingType.cs +++ b/plugins/dali-sharp/sharp/internal/PaddingType.cs @@ -28,7 +28,7 @@ public class PaddingType : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/PageFactory.cs b/plugins/dali-sharp/sharp/internal/PageFactory.cs index 939998f..03b4384 100644 --- a/plugins/dali-sharp/sharp/internal/PageFactory.cs +++ b/plugins/dali-sharp/sharp/internal/PageFactory.cs @@ -28,7 +28,7 @@ public class PageFactory : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/PagePanSignal.cs b/plugins/dali-sharp/sharp/internal/PagePanSignal.cs index 25fc566..832c237 100644 --- a/plugins/dali-sharp/sharp/internal/PagePanSignal.cs +++ b/plugins/dali-sharp/sharp/internal/PagePanSignal.cs @@ -28,7 +28,7 @@ public class PagePanSignal : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/PageTurnLandscapeView.cs b/plugins/dali-sharp/sharp/internal/PageTurnLandscapeView.cs index 7813d66..70b69c2 100644 --- a/plugins/dali-sharp/sharp/internal/PageTurnLandscapeView.cs +++ b/plugins/dali-sharp/sharp/internal/PageTurnLandscapeView.cs @@ -42,7 +42,7 @@ public class PageTurnLandscapeView : PageTurnView { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/PageTurnPortraitView.cs b/plugins/dali-sharp/sharp/internal/PageTurnPortraitView.cs index bae81a2..b27c84a 100644 --- a/plugins/dali-sharp/sharp/internal/PageTurnPortraitView.cs +++ b/plugins/dali-sharp/sharp/internal/PageTurnPortraitView.cs @@ -42,7 +42,7 @@ public class PageTurnPortraitView : PageTurnView { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/PageTurnSignal.cs b/plugins/dali-sharp/sharp/internal/PageTurnSignal.cs index ff838f4..d4bb117 100644 --- a/plugins/dali-sharp/sharp/internal/PageTurnSignal.cs +++ b/plugins/dali-sharp/sharp/internal/PageTurnSignal.cs @@ -28,7 +28,7 @@ public class PageTurnSignal : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/PageTurnView.cs b/plugins/dali-sharp/sharp/internal/PageTurnView.cs index 82547bc..c8f003d 100644 --- a/plugins/dali-sharp/sharp/internal/PageTurnView.cs +++ b/plugins/dali-sharp/sharp/internal/PageTurnView.cs @@ -30,7 +30,7 @@ public class PageTurnView : View { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/PanGesture.cs b/plugins/dali-sharp/sharp/internal/PanGesture.cs index ab0c320..d822102 100644 --- a/plugins/dali-sharp/sharp/internal/PanGesture.cs +++ b/plugins/dali-sharp/sharp/internal/PanGesture.cs @@ -26,7 +26,7 @@ public class PanGesture : Gesture { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/PanGestureDetectedSignal.cs b/plugins/dali-sharp/sharp/internal/PanGestureDetectedSignal.cs index 7fe6e04..17894b5 100644 --- a/plugins/dali-sharp/sharp/internal/PanGestureDetectedSignal.cs +++ b/plugins/dali-sharp/sharp/internal/PanGestureDetectedSignal.cs @@ -28,7 +28,7 @@ public class PanGestureDetectedSignal : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/PanGestureDetector.cs b/plugins/dali-sharp/sharp/internal/PanGestureDetector.cs index 4b792c7..0d7b557 100644 --- a/plugins/dali-sharp/sharp/internal/PanGestureDetector.cs +++ b/plugins/dali-sharp/sharp/internal/PanGestureDetector.cs @@ -46,7 +46,7 @@ public class PanGestureDetector : GestureDetector { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/Path.cs b/plugins/dali-sharp/sharp/internal/Path.cs index ddf30e8..31897da 100644 --- a/plugins/dali-sharp/sharp/internal/Path.cs +++ b/plugins/dali-sharp/sharp/internal/Path.cs @@ -42,7 +42,7 @@ public class Path : BaseHandle { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/PathConstrainer.cs b/plugins/dali-sharp/sharp/internal/PathConstrainer.cs index 9d6f136..2b9cc6a 100644 --- a/plugins/dali-sharp/sharp/internal/PathConstrainer.cs +++ b/plugins/dali-sharp/sharp/internal/PathConstrainer.cs @@ -42,7 +42,7 @@ public class PathConstrainer : BaseHandle { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/PinchGesture.cs b/plugins/dali-sharp/sharp/internal/PinchGesture.cs index 3b7008e..e88b531 100644 --- a/plugins/dali-sharp/sharp/internal/PinchGesture.cs +++ b/plugins/dali-sharp/sharp/internal/PinchGesture.cs @@ -26,7 +26,7 @@ public class PinchGesture : Gesture { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/PinchGestureDetectedSignal.cs b/plugins/dali-sharp/sharp/internal/PinchGestureDetectedSignal.cs index ddb2fc3..7499af5 100644 --- a/plugins/dali-sharp/sharp/internal/PinchGestureDetectedSignal.cs +++ b/plugins/dali-sharp/sharp/internal/PinchGestureDetectedSignal.cs @@ -28,7 +28,7 @@ public class PinchGestureDetectedSignal : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/PinchGestureDetector.cs b/plugins/dali-sharp/sharp/internal/PinchGestureDetector.cs index d193dab..7467e62 100644 --- a/plugins/dali-sharp/sharp/internal/PinchGestureDetector.cs +++ b/plugins/dali-sharp/sharp/internal/PinchGestureDetector.cs @@ -46,7 +46,7 @@ public class PinchGestureDetector : GestureDetector { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/PixelData.cs b/plugins/dali-sharp/sharp/internal/PixelData.cs index 40fe2f1..488919c 100644 --- a/plugins/dali-sharp/sharp/internal/PixelData.cs +++ b/plugins/dali-sharp/sharp/internal/PixelData.cs @@ -42,7 +42,7 @@ public class PixelData : BaseHandle { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/Popup.cs b/plugins/dali-sharp/sharp/internal/Popup.cs index 44aa5cb..79d92f5 100644 --- a/plugins/dali-sharp/sharp/internal/Popup.cs +++ b/plugins/dali-sharp/sharp/internal/Popup.cs @@ -46,7 +46,7 @@ public class Popup : View { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/Position.cs b/plugins/dali-sharp/sharp/internal/Position.cs index b705ac6..27b5dd4 100755 --- a/plugins/dali-sharp/sharp/internal/Position.cs +++ b/plugins/dali-sharp/sharp/internal/Position.cs @@ -35,7 +35,7 @@ public class Position : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/Position2D.cs b/plugins/dali-sharp/sharp/internal/Position2D.cs index 668b5b0..4379d6b 100755 --- a/plugins/dali-sharp/sharp/internal/Position2D.cs +++ b/plugins/dali-sharp/sharp/internal/Position2D.cs @@ -35,7 +35,7 @@ public class Position2D : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/ProgressBar.cs b/plugins/dali-sharp/sharp/internal/ProgressBar.cs index 1372d5b..5bb8281 100644 --- a/plugins/dali-sharp/sharp/internal/ProgressBar.cs +++ b/plugins/dali-sharp/sharp/internal/ProgressBar.cs @@ -46,7 +46,7 @@ public class ProgressBar : View { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/ProgressBarValueChangedSignal.cs b/plugins/dali-sharp/sharp/internal/ProgressBarValueChangedSignal.cs index 578942f..08fb49b 100644 --- a/plugins/dali-sharp/sharp/internal/ProgressBarValueChangedSignal.cs +++ b/plugins/dali-sharp/sharp/internal/ProgressBarValueChangedSignal.cs @@ -28,7 +28,7 @@ public class ProgressBarValueChangedSignal : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/Property.cs b/plugins/dali-sharp/sharp/internal/Property.cs index 551b2ae..f1dc0f9 100644 --- a/plugins/dali-sharp/sharp/internal/Property.cs +++ b/plugins/dali-sharp/sharp/internal/Property.cs @@ -28,7 +28,7 @@ public class Property : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/PropertyBuffer.cs b/plugins/dali-sharp/sharp/internal/PropertyBuffer.cs index 478978b..dc75cb6 100644 --- a/plugins/dali-sharp/sharp/internal/PropertyBuffer.cs +++ b/plugins/dali-sharp/sharp/internal/PropertyBuffer.cs @@ -42,7 +42,7 @@ public class PropertyBuffer : BaseHandle { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/PropertyCondition.cs b/plugins/dali-sharp/sharp/internal/PropertyCondition.cs index d72c218..65abe14 100644 --- a/plugins/dali-sharp/sharp/internal/PropertyCondition.cs +++ b/plugins/dali-sharp/sharp/internal/PropertyCondition.cs @@ -26,7 +26,7 @@ public class PropertyCondition : BaseHandle { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/PropertyNotification.cs b/plugins/dali-sharp/sharp/internal/PropertyNotification.cs index 14b25e8..d1f1048 100644 --- a/plugins/dali-sharp/sharp/internal/PropertyNotification.cs +++ b/plugins/dali-sharp/sharp/internal/PropertyNotification.cs @@ -30,7 +30,7 @@ public class PropertyNotification : BaseHandle { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/PropertyNotifySignal.cs b/plugins/dali-sharp/sharp/internal/PropertyNotifySignal.cs index 18bb0d8..f253371 100644 --- a/plugins/dali-sharp/sharp/internal/PropertyNotifySignal.cs +++ b/plugins/dali-sharp/sharp/internal/PropertyNotifySignal.cs @@ -28,7 +28,7 @@ public class PropertyNotifySignal : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/PushButton.cs b/plugins/dali-sharp/sharp/internal/PushButton.cs index 94d358b..5bc4f1f 100644 --- a/plugins/dali-sharp/sharp/internal/PushButton.cs +++ b/plugins/dali-sharp/sharp/internal/PushButton.cs @@ -42,7 +42,7 @@ public class PushButton : Button { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/Radian.cs b/plugins/dali-sharp/sharp/internal/Radian.cs index 6d73925..dd791ef 100644 --- a/plugins/dali-sharp/sharp/internal/Radian.cs +++ b/plugins/dali-sharp/sharp/internal/Radian.cs @@ -28,7 +28,7 @@ public class Radian : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/RadioButton.cs b/plugins/dali-sharp/sharp/internal/RadioButton.cs index 1f7e46d..8b70cb5 100644 --- a/plugins/dali-sharp/sharp/internal/RadioButton.cs +++ b/plugins/dali-sharp/sharp/internal/RadioButton.cs @@ -42,7 +42,7 @@ public class RadioButton : Button { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/Rectangle.cs b/plugins/dali-sharp/sharp/internal/Rectangle.cs index fc22303..ae1a2e1 100644 --- a/plugins/dali-sharp/sharp/internal/Rectangle.cs +++ b/plugins/dali-sharp/sharp/internal/Rectangle.cs @@ -28,7 +28,7 @@ public class Rectangle : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/RelayoutContainer.cs b/plugins/dali-sharp/sharp/internal/RelayoutContainer.cs index 9b7e9b6..9270c54 100644 --- a/plugins/dali-sharp/sharp/internal/RelayoutContainer.cs +++ b/plugins/dali-sharp/sharp/internal/RelayoutContainer.cs @@ -28,7 +28,7 @@ public class RelayoutContainer : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/RenderTask.cs b/plugins/dali-sharp/sharp/internal/RenderTask.cs index 0db9eae..e16deed 100644 --- a/plugins/dali-sharp/sharp/internal/RenderTask.cs +++ b/plugins/dali-sharp/sharp/internal/RenderTask.cs @@ -26,7 +26,7 @@ public class RenderTask : Animatable { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/RenderTaskList.cs b/plugins/dali-sharp/sharp/internal/RenderTaskList.cs index 9f684e4..e5a5585 100644 --- a/plugins/dali-sharp/sharp/internal/RenderTaskList.cs +++ b/plugins/dali-sharp/sharp/internal/RenderTaskList.cs @@ -26,7 +26,7 @@ public class RenderTaskList : BaseHandle { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/RenderTaskSignal.cs b/plugins/dali-sharp/sharp/internal/RenderTaskSignal.cs index 31579f9..88903f3 100644 --- a/plugins/dali-sharp/sharp/internal/RenderTaskSignal.cs +++ b/plugins/dali-sharp/sharp/internal/RenderTaskSignal.cs @@ -28,7 +28,7 @@ public class RenderTaskSignal : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/Renderer.cs b/plugins/dali-sharp/sharp/internal/Renderer.cs index e7051be..f5cd740 100644 --- a/plugins/dali-sharp/sharp/internal/Renderer.cs +++ b/plugins/dali-sharp/sharp/internal/Renderer.cs @@ -42,7 +42,7 @@ public class Renderer : Animatable { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/ResourceImage.cs b/plugins/dali-sharp/sharp/internal/ResourceImage.cs index 4d4b7ff..945537c 100644 --- a/plugins/dali-sharp/sharp/internal/ResourceImage.cs +++ b/plugins/dali-sharp/sharp/internal/ResourceImage.cs @@ -46,7 +46,7 @@ public class ResourceImage : Image { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/ResourceImageSignal.cs b/plugins/dali-sharp/sharp/internal/ResourceImageSignal.cs index 0a77205..58b1bfe 100644 --- a/plugins/dali-sharp/sharp/internal/ResourceImageSignal.cs +++ b/plugins/dali-sharp/sharp/internal/ResourceImageSignal.cs @@ -28,7 +28,7 @@ public class ResourceImageSignal : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/Rotation.cs b/plugins/dali-sharp/sharp/internal/Rotation.cs index ba6e83c..d332d90 100644 --- a/plugins/dali-sharp/sharp/internal/Rotation.cs +++ b/plugins/dali-sharp/sharp/internal/Rotation.cs @@ -28,7 +28,7 @@ public class Rotation : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/RulerPtr.cs b/plugins/dali-sharp/sharp/internal/RulerPtr.cs index 219f310..34ae3a8 100644 --- a/plugins/dali-sharp/sharp/internal/RulerPtr.cs +++ b/plugins/dali-sharp/sharp/internal/RulerPtr.cs @@ -28,7 +28,7 @@ public class RulerPtr : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/Sampler.cs b/plugins/dali-sharp/sharp/internal/Sampler.cs index ad11ee2..4ca9f65 100644 --- a/plugins/dali-sharp/sharp/internal/Sampler.cs +++ b/plugins/dali-sharp/sharp/internal/Sampler.cs @@ -42,7 +42,7 @@ public class Sampler : BaseHandle { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/ScrollBar.cs b/plugins/dali-sharp/sharp/internal/ScrollBar.cs index c12976d..3266752 100644 --- a/plugins/dali-sharp/sharp/internal/ScrollBar.cs +++ b/plugins/dali-sharp/sharp/internal/ScrollBar.cs @@ -46,7 +46,7 @@ public class ScrollBar : View { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/ScrollView.cs b/plugins/dali-sharp/sharp/internal/ScrollView.cs index ae39932..3ccaaa2 100644 --- a/plugins/dali-sharp/sharp/internal/ScrollView.cs +++ b/plugins/dali-sharp/sharp/internal/ScrollView.cs @@ -46,7 +46,7 @@ public class ScrollView : Scrollable { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/ScrollViewEffect.cs b/plugins/dali-sharp/sharp/internal/ScrollViewEffect.cs index 1793e9a..1d54301 100644 --- a/plugins/dali-sharp/sharp/internal/ScrollViewEffect.cs +++ b/plugins/dali-sharp/sharp/internal/ScrollViewEffect.cs @@ -26,7 +26,7 @@ public class ScrollViewEffect : BaseHandle { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/ScrollViewPagePathEffect.cs b/plugins/dali-sharp/sharp/internal/ScrollViewPagePathEffect.cs index b2f5674..2cd59d7 100644 --- a/plugins/dali-sharp/sharp/internal/ScrollViewPagePathEffect.cs +++ b/plugins/dali-sharp/sharp/internal/ScrollViewPagePathEffect.cs @@ -42,7 +42,7 @@ public class ScrollViewPagePathEffect : ScrollViewEffect { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/ScrollViewSnapStartedSignal.cs b/plugins/dali-sharp/sharp/internal/ScrollViewSnapStartedSignal.cs index ef95015..6074898 100644 --- a/plugins/dali-sharp/sharp/internal/ScrollViewSnapStartedSignal.cs +++ b/plugins/dali-sharp/sharp/internal/ScrollViewSnapStartedSignal.cs @@ -28,7 +28,7 @@ public class ScrollViewSnapStartedSignal : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/Scrollable.cs b/plugins/dali-sharp/sharp/internal/Scrollable.cs index 6c533dc..42569a7 100644 --- a/plugins/dali-sharp/sharp/internal/Scrollable.cs +++ b/plugins/dali-sharp/sharp/internal/Scrollable.cs @@ -30,7 +30,7 @@ public class Scrollable : View { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/ScrollableSignal.cs b/plugins/dali-sharp/sharp/internal/ScrollableSignal.cs index b6a25a2..d4ef47f 100644 --- a/plugins/dali-sharp/sharp/internal/ScrollableSignal.cs +++ b/plugins/dali-sharp/sharp/internal/ScrollableSignal.cs @@ -28,7 +28,7 @@ public class ScrollableSignal : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/Shader.cs b/plugins/dali-sharp/sharp/internal/Shader.cs index 1e6d722..d17e399 100644 --- a/plugins/dali-sharp/sharp/internal/Shader.cs +++ b/plugins/dali-sharp/sharp/internal/Shader.cs @@ -42,7 +42,7 @@ public class Shader : Animatable { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/SignalObserver.cs b/plugins/dali-sharp/sharp/internal/SignalObserver.cs index 5da0505..36b1d11 100644 --- a/plugins/dali-sharp/sharp/internal/SignalObserver.cs +++ b/plugins/dali-sharp/sharp/internal/SignalObserver.cs @@ -28,7 +28,7 @@ public class SignalObserver : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/Size.cs b/plugins/dali-sharp/sharp/internal/Size.cs index 930557f..05b83d1 100755 --- a/plugins/dali-sharp/sharp/internal/Size.cs +++ b/plugins/dali-sharp/sharp/internal/Size.cs @@ -35,7 +35,7 @@ public class Size : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/Size2D.cs b/plugins/dali-sharp/sharp/internal/Size2D.cs index fb37d41..9b69912 100755 --- a/plugins/dali-sharp/sharp/internal/Size2D.cs +++ b/plugins/dali-sharp/sharp/internal/Size2D.cs @@ -35,7 +35,7 @@ public class Size2D : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/Slider.cs b/plugins/dali-sharp/sharp/internal/Slider.cs index f1c38c1..ee42f34 100644 --- a/plugins/dali-sharp/sharp/internal/Slider.cs +++ b/plugins/dali-sharp/sharp/internal/Slider.cs @@ -46,7 +46,7 @@ public class Slider : View { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/SliderMarkReachedSignal.cs b/plugins/dali-sharp/sharp/internal/SliderMarkReachedSignal.cs index b252fec..43d8d8a 100644 --- a/plugins/dali-sharp/sharp/internal/SliderMarkReachedSignal.cs +++ b/plugins/dali-sharp/sharp/internal/SliderMarkReachedSignal.cs @@ -28,7 +28,7 @@ public class SliderMarkReachedSignal : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/SliderValueChangedSignal.cs b/plugins/dali-sharp/sharp/internal/SliderValueChangedSignal.cs index 412f17e..33484e3 100644 --- a/plugins/dali-sharp/sharp/internal/SliderValueChangedSignal.cs +++ b/plugins/dali-sharp/sharp/internal/SliderValueChangedSignal.cs @@ -28,7 +28,7 @@ public class SliderValueChangedSignal : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/SlotObserver.cs b/plugins/dali-sharp/sharp/internal/SlotObserver.cs index 104793c..edcbf6b 100644 --- a/plugins/dali-sharp/sharp/internal/SlotObserver.cs +++ b/plugins/dali-sharp/sharp/internal/SlotObserver.cs @@ -28,7 +28,7 @@ public class SlotObserver : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/Stage.cs b/plugins/dali-sharp/sharp/internal/Stage.cs deleted file mode 100644 index 3eef0a5..0000000 --- a/plugins/dali-sharp/sharp/internal/Stage.cs +++ /dev/null @@ -1,651 +0,0 @@ -//------------------------------------------------------------------------------ -// -// -// This file was automatically generated by SWIG (http://www.swig.org). -// Version 3.0.10 -// -// Do not make changes to this file unless you know what you are doing--modify -// the SWIG interface file instead. -//------------------------------------------------------------------------------ - -namespace Dali { - -using System; -using System.Runtime.InteropServices; - - -public class Stage : BaseHandle { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - - internal Stage(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Stage_SWIGUpcast(cPtr), cMemoryOwn) { - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Stage obj) { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - ~Stage() { - DisposeQueue.Instance.Add(this); - } - - public override void Dispose() { - if (!Stage.IsInstalled()) { - DisposeQueue.Instance.Add(this); - return; - } - - lock(this) { - if (swigCPtr.Handle != global::System.IntPtr.Zero) { - if (swigCMemOwn) { - swigCMemOwn = false; - NDalicPINVOKE.delete_Stage(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - global::System.GC.SuppressFinalize(this); - base.Dispose(); - } - } - - - - - /** - * @brief Event arguments that passed via Touch signal - * - */ - public class TouchEventArgs : EventArgs - { - private Touch _touch; - - /** - * @brief Touch - contains the information of touch points - * - */ - public Touch Touch - { - get - { - return _touch; - } - set - { - _touch = value; - } - } - } - - private event EventHandler _stageTouchHandler; - private EventCallbackDelegateType1 _stageTouchCallbackDelegate; - - /** - * @brief Event for TouchEvent signal which can be used to subscribe/unsubscribe the event handler - * TouchEvent signal is emitted when the screen is touched and when the touch ends - * (i.e. the down & up touch events only). - * - */ - public event EventHandler Touch - { - add - { - lock(this) - { - _stageTouchHandler += value; - _stageTouchCallbackDelegate = OnStageTouch; - this.TouchSignal().Connect(_stageTouchCallbackDelegate); - } - } - remove - { - lock(this) - { - if (_stageTouchHandler != null) - { - this.TouchSignal().Disconnect(_stageTouchCallbackDelegate); - } - _stageTouchHandler -= value; - } - } - } - - private void OnStageTouch(IntPtr data) - { - TouchEventArgs e = new TouchEventArgs(); - - if( data != null ) - { - e.Touch = Dali.Touch.GetTouchFromPtr( data ); - } - - if (_stageTouchHandler != null) - { - _stageTouchHandler(this, e); - } - } - - /** - * @brief Wheel arguments that passed via Wheel signal - * - */ - public class WheelEventArgs : EventArgs - { - private Wheel _wheel; - - /** - * @brief Wheel - store a wheel rolling type MOUSE_WHEEL or CUSTOM_WHEEL - * - */ - public Wheel Wheel - { - get - { - return _wheel; - } - set - { - _wheel = value; - } - } - } - - private event EventHandler _stageWheelHandler; - private EventCallbackDelegateType1 _stageWheelCallbackDelegate; - - /** - * @brief Event for Wheel signal which can be used to subscribe/unsubscribe the event handler - * Wheel signal is emitted is emitted when wheel event is received. - * - */ - public event EventHandler Wheel - { - add - { - lock(this) - { - _stageWheelHandler += value; - _stageWheelCallbackDelegate = OnStageWheel; - this.WheelEventSignal().Connect(_stageWheelCallbackDelegate); - } - } - remove - { - lock(this) - { - if (_stageWheelHandler != null) - { - this.WheelEventSignal().Disconnect(_stageWheelCallbackDelegate); - } - _stageWheelHandler -= value; - } - } - } - - private void OnStageWheel(IntPtr data) - { - WheelEventArgs e = new WheelEventArgs(); - - if( data != null ) - { - e.Wheel = Dali.Wheel.GetWheelFromPtr( data ); - } - - if (_stageWheelHandler != null) - { - _stageWheelHandler(this, e); - } - } - - /** - * @brief Event arguments that passed via Key signal - * - */ - public class KeyEventArgs : EventArgs - { - private Key _key; - - /** - * @brief Key - is the keyevent sent to Stage. - * - */ - public Key Key - { - get - { - return _key; - } - set - { - _key = value; - } - } - } - - private event EventHandler _stageKeyHandler; - private EventCallbackDelegateType1 _stageKeyCallbackDelegate; - - /** - * @brief Event for Key signal which can be used to subscribe/unsubscribe the event handler - * Key signal is emitted is emitted when key event is received. - * - */ - public event EventHandler Key - { - add - { - lock(this) - { - _stageKeyHandler += value; - _stageKeyCallbackDelegate = OnStageKey; - this.KeyEventSignal().Connect(_stageKeyCallbackDelegate); - } - } - remove - { - lock(this) - { - if (_stageKeyHandler != null) - { - this.KeyEventSignal().Disconnect(_stageKeyCallbackDelegate); - } - _stageKeyHandler -= value; - } - } - } - - // Callback for Stage KeyEventsignal - private void OnStageKey(IntPtr data) - { - KeyEventArgs e = new KeyEventArgs(); - - if( data != null ) - { - e.Key = Dali.Key.GetKeyFromPtr( data ); - } - - if (_stageKeyHandler != null) - { - //here we send all data to user event handlers - _stageKeyHandler(this, e); - } - } - - - private event EventHandler _stageEventProcessingFinishedEventHandler; - private EventCallbackDelegateType0 _stageEventProcessingFinishedEventCallbackDelegate; - - /** - * @brief Event for EventProcessingFinished signal which can be used to subscribe/unsubscribe the event handler - * provided by the user. EventProcessingFinished signal is emitted just after the event processing is finished. - * - */ - public event EventHandler EventProcessingFinished - { - add - { - lock(this) - { - _stageEventProcessingFinishedEventHandler += value; - _stageEventProcessingFinishedEventCallbackDelegate = OnEventProcessingFinished; - this.EventProcessingFinishedSignal().Connect(_stageEventProcessingFinishedEventCallbackDelegate); - } - } - remove - { - lock(this) - { - if (_stageEventProcessingFinishedEventHandler != null) - { - this.EventProcessingFinishedSignal().Disconnect(_stageEventProcessingFinishedEventCallbackDelegate); - } - _stageEventProcessingFinishedEventHandler -= value; - } - } - } - - // Callback for Stage EventProcessingFinishedSignal - private void OnEventProcessingFinished() - { - if (_stageEventProcessingFinishedEventHandler != null) - { - _stageEventProcessingFinishedEventHandler(this, null); - } - } - - - private EventHandler _stageContextLostEventHandler; - private EventCallbackDelegateType0 _stageContextLostEventCallbackDelegate; - - /** - * @brief Event for ContextLost signal which can be used to subscribe/unsubscribe the event handler - * ContextLost signal is emitted when the GL context is lost (Platform specific behaviour). - * - */ - public event EventHandler ContextLost - { - add - { - lock(this) - { - _stageContextLostEventHandler += value; - _stageContextLostEventCallbackDelegate = OnContextLost; - this.ContextLostSignal().Connect(_stageContextLostEventCallbackDelegate); - } - } - remove - { - lock(this) - { - if (_stageContextLostEventHandler != null) - { - this.ContextLostSignal().Disconnect(_stageContextLostEventCallbackDelegate); - } - - _stageContextLostEventHandler -= value; - } - } - } - - // Callback for Stage ContextLostSignal - private void OnContextLost() - { - if (_stageContextLostEventHandler != null) - { - _stageContextLostEventHandler(this, null); - } - } - - - private EventHandler _stageContextRegainedEventHandler; - private EventCallbackDelegateType0 _stageContextRegainedEventCallbackDelegate; - - /** - * @brief Event for ContextRegained signal which can be used to subscribe/unsubscribe the event handler - * provided by the user. ContextRegained signal is emitted when the GL context is regained (Platform specific - * behaviour). - * - */ - public event EventHandler ContextRegained - { - add - { - lock(this) - { - _stageContextRegainedEventHandler += value; - _stageContextRegainedEventCallbackDelegate = OnContextRegained; - this.ContextRegainedSignal().Connect(_stageContextRegainedEventCallbackDelegate); - } - } - remove - { - lock(this) - { - if (_stageContextRegainedEventHandler != null) - { - this.ContextRegainedSignal().Disconnect(_stageContextRegainedEventCallbackDelegate); - } - - _stageContextRegainedEventHandler -= value; - } - } - } - - // Callback for Stage ContextRegainedSignal - private void OnContextRegained() - { - if (_stageContextRegainedEventHandler != null) - { - _stageContextRegainedEventHandler(this, null); - } - } - - - private EventHandler _stageSceneCreatedEventHandler; - private EventCallbackDelegateType0 _stageSceneCreatedEventCallbackDelegate; - - /** - * @brief Event for SceneCreated signal which can be used to subscribe/unsubscribe the event handler - * SceneCreated signal is emitted after the initial scene is created. - * - */ - public event EventHandler SceneCreated - { - add - { - lock(this) - { - _stageSceneCreatedEventHandler += value; - _stageSceneCreatedEventCallbackDelegate = OnSceneCreated; - this.SceneCreatedSignal().Connect(_stageSceneCreatedEventCallbackDelegate); - } - } - remove - { - lock(this) - { - if (_stageSceneCreatedEventHandler != null) - { - this.SceneCreatedSignal().Disconnect(_stageSceneCreatedEventCallbackDelegate); - } - - _stageSceneCreatedEventHandler -= value; - } - } - } - - // Callback for Stage SceneCreatedSignal - private void OnSceneCreated() - { - if (_stageSceneCreatedEventHandler != null) - { - _stageSceneCreatedEventHandler(this, null); - } - } - - - public Vector2 Size - { - get - { - Vector2 ret = GetSize(); - return ret; - } - } - - public Vector4 BackgroundColor - { - set - { - SetBackgroundColor(value); - } - get - { - Vector4 ret = GetBackgroundColor(); - return ret; - } - } - - private static readonly Stage instance = Stage.GetCurrent(); - - public static Stage Instance - { - get - { - return instance; - } - } - - public Layer GetDefaultLayer() - { - return this.GetRootLayer(); - } - - public void AddLayer(Layer layer) - { - NDalicPINVOKE.Stage_Add(swigCPtr, Layer.getCPtr(layer)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public void RemoveLayer(Layer layer) - { - NDalicPINVOKE.Stage_Remove(swigCPtr, Layer.getCPtr(layer)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public static Vector4 DEFAULT_BACKGROUND_COLOR { - get { - global::System.IntPtr cPtr = NDalicPINVOKE.Stage_DEFAULT_BACKGROUND_COLOR_get(); - Vector4 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector4(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - public static Vector4 DEBUG_BACKGROUND_COLOR { - get { - global::System.IntPtr cPtr = NDalicPINVOKE.Stage_DEBUG_BACKGROUND_COLOR_get(); - Vector4 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector4(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - public Stage() : this(NDalicPINVOKE.new_Stage__SWIG_0(), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public static Stage GetCurrent() { - Stage ret = new Stage(NDalicPINVOKE.Stage_GetCurrent(), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public static bool IsInstalled() { - bool ret = NDalicPINVOKE.Stage_IsInstalled(); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public Stage(Stage handle) : this(NDalicPINVOKE.new_Stage__SWIG_1(Stage.getCPtr(handle)), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public Stage Assign(Stage rhs) { - Stage ret = new Stage(NDalicPINVOKE.Stage_Assign(swigCPtr, Stage.getCPtr(rhs)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public void Add(View view) { - NDalicPINVOKE.Stage_Add(swigCPtr, View.getCPtr(view)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public void Remove(View view) { - NDalicPINVOKE.Stage_Remove(swigCPtr, View.getCPtr(view)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public Vector2 GetSize() { - Vector2 ret = new Vector2(NDalicPINVOKE.Stage_GetSize(swigCPtr), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public RenderTaskList GetRenderTaskList() { - RenderTaskList ret = new RenderTaskList(NDalicPINVOKE.Stage_GetRenderTaskList(swigCPtr), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public uint GetLayerCount() { - uint ret = NDalicPINVOKE.Stage_GetLayerCount(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public Layer GetLayer(uint depth) { - Layer ret = new Layer(NDalicPINVOKE.Stage_GetLayer(swigCPtr, depth), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public Layer GetRootLayer() { - Layer ret = new Layer(NDalicPINVOKE.Stage_GetRootLayer(swigCPtr), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public void SetBackgroundColor(Vector4 color) { - NDalicPINVOKE.Stage_SetBackgroundColor(swigCPtr, Vector4.getCPtr(color)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public Vector4 GetBackgroundColor() { - Vector4 ret = new Vector4(NDalicPINVOKE.Stage_GetBackgroundColor(swigCPtr), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public Vector2 GetDpi() { - Vector2 ret = new Vector2(NDalicPINVOKE.Stage_GetDpi(swigCPtr), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public ObjectRegistry GetObjectRegistry() { - ObjectRegistry ret = new ObjectRegistry(NDalicPINVOKE.Stage_GetObjectRegistry(swigCPtr), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public void KeepRendering(float durationSeconds) { - NDalicPINVOKE.Stage_KeepRendering(swigCPtr, durationSeconds); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public KeyEventSignal KeyEventSignal() { - KeyEventSignal ret = new KeyEventSignal(NDalicPINVOKE.Stage_KeyEventSignal(swigCPtr), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public VoidSignal EventProcessingFinishedSignal() { - VoidSignal ret = new VoidSignal(NDalicPINVOKE.Stage_EventProcessingFinishedSignal(swigCPtr), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public TouchSignal TouchSignal() { - TouchSignal ret = new TouchSignal(NDalicPINVOKE.Stage_TouchSignal(swigCPtr), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public StageWheelSignal WheelEventSignal() { - StageWheelSignal ret = new StageWheelSignal(NDalicPINVOKE.Stage_WheelEventSignal(swigCPtr), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public VoidSignal ContextLostSignal() { - VoidSignal ret = new VoidSignal(NDalicPINVOKE.Stage_ContextLostSignal(swigCPtr), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public VoidSignal ContextRegainedSignal() { - VoidSignal ret = new VoidSignal(NDalicPINVOKE.Stage_ContextRegainedSignal(swigCPtr), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public VoidSignal SceneCreatedSignal() { - VoidSignal ret = new VoidSignal(NDalicPINVOKE.Stage_SceneCreatedSignal(swigCPtr), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - -} - -} diff --git a/plugins/dali-sharp/sharp/internal/StageWheelSignal.cs b/plugins/dali-sharp/sharp/internal/StageWheelSignal.cs index 14b7c6f..bab6816 100644 --- a/plugins/dali-sharp/sharp/internal/StageWheelSignal.cs +++ b/plugins/dali-sharp/sharp/internal/StageWheelSignal.cs @@ -28,7 +28,7 @@ public class StageWheelSignal : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/StyleChangedSignal.cs b/plugins/dali-sharp/sharp/internal/StyleChangedSignal.cs index 8ff2c72..6773371 100644 --- a/plugins/dali-sharp/sharp/internal/StyleChangedSignal.cs +++ b/plugins/dali-sharp/sharp/internal/StyleChangedSignal.cs @@ -28,7 +28,7 @@ public class StyleChangedSignal : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/StyleManager.cs b/plugins/dali-sharp/sharp/internal/StyleManager.cs index 64fee71..a9f69d6 100644 --- a/plugins/dali-sharp/sharp/internal/StyleManager.cs +++ b/plugins/dali-sharp/sharp/internal/StyleManager.cs @@ -29,7 +29,7 @@ public class StyleManager : BaseHandle { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/TableView.cs b/plugins/dali-sharp/sharp/internal/TableView.cs index 6fd4508..7f70d8f 100644 --- a/plugins/dali-sharp/sharp/internal/TableView.cs +++ b/plugins/dali-sharp/sharp/internal/TableView.cs @@ -42,7 +42,7 @@ public class TableView : View { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/TapGesture.cs b/plugins/dali-sharp/sharp/internal/TapGesture.cs index 85d01b7..1a45871 100644 --- a/plugins/dali-sharp/sharp/internal/TapGesture.cs +++ b/plugins/dali-sharp/sharp/internal/TapGesture.cs @@ -26,7 +26,7 @@ public class TapGesture : Gesture { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/TapGestureDetectedSignal.cs b/plugins/dali-sharp/sharp/internal/TapGestureDetectedSignal.cs index e36189c..5eda3bf6 100644 --- a/plugins/dali-sharp/sharp/internal/TapGestureDetectedSignal.cs +++ b/plugins/dali-sharp/sharp/internal/TapGestureDetectedSignal.cs @@ -28,7 +28,7 @@ public class TapGestureDetectedSignal : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/TapGestureDetector.cs b/plugins/dali-sharp/sharp/internal/TapGestureDetector.cs index d83abba..4150aa6 100644 --- a/plugins/dali-sharp/sharp/internal/TapGestureDetector.cs +++ b/plugins/dali-sharp/sharp/internal/TapGestureDetector.cs @@ -45,7 +45,7 @@ public class TapGestureDetector : GestureDetector { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/TextEditor.cs b/plugins/dali-sharp/sharp/internal/TextEditor.cs index 557f7f2..9cb93fa 100644 --- a/plugins/dali-sharp/sharp/internal/TextEditor.cs +++ b/plugins/dali-sharp/sharp/internal/TextEditor.cs @@ -46,7 +46,7 @@ public class TextEditor : View { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/TextEditorSignal.cs b/plugins/dali-sharp/sharp/internal/TextEditorSignal.cs index b25acc2..6a94050 100644 --- a/plugins/dali-sharp/sharp/internal/TextEditorSignal.cs +++ b/plugins/dali-sharp/sharp/internal/TextEditorSignal.cs @@ -28,7 +28,7 @@ public class TextEditorSignal : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/TextField.cs b/plugins/dali-sharp/sharp/internal/TextField.cs index 2ae92f8..38bb8a9 100644 --- a/plugins/dali-sharp/sharp/internal/TextField.cs +++ b/plugins/dali-sharp/sharp/internal/TextField.cs @@ -46,7 +46,7 @@ public class TextField : View { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/TextFieldSignal.cs b/plugins/dali-sharp/sharp/internal/TextFieldSignal.cs index ffe714d..5085104 100644 --- a/plugins/dali-sharp/sharp/internal/TextFieldSignal.cs +++ b/plugins/dali-sharp/sharp/internal/TextFieldSignal.cs @@ -28,7 +28,7 @@ public class TextFieldSignal : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/TextLabel.cs b/plugins/dali-sharp/sharp/internal/TextLabel.cs index 2cdeca8..ce1f1d8 100644 --- a/plugins/dali-sharp/sharp/internal/TextLabel.cs +++ b/plugins/dali-sharp/sharp/internal/TextLabel.cs @@ -42,7 +42,7 @@ public class TextLabel : View { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/Texture.cs b/plugins/dali-sharp/sharp/internal/Texture.cs index 96f5c18..00c511c 100644 --- a/plugins/dali-sharp/sharp/internal/Texture.cs +++ b/plugins/dali-sharp/sharp/internal/Texture.cs @@ -42,7 +42,7 @@ public class Texture : BaseHandle { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/TextureSet.cs b/plugins/dali-sharp/sharp/internal/TextureSet.cs index adb5ce9..52756a8 100644 --- a/plugins/dali-sharp/sharp/internal/TextureSet.cs +++ b/plugins/dali-sharp/sharp/internal/TextureSet.cs @@ -42,7 +42,7 @@ public class TextureSet : BaseHandle { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/TimePeriod.cs b/plugins/dali-sharp/sharp/internal/TimePeriod.cs index c268aed..b394e4f 100644 --- a/plugins/dali-sharp/sharp/internal/TimePeriod.cs +++ b/plugins/dali-sharp/sharp/internal/TimePeriod.cs @@ -28,7 +28,7 @@ public class TimePeriod : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/Timer.cs b/plugins/dali-sharp/sharp/internal/Timer.cs index d744e5c..7e57604 100644 --- a/plugins/dali-sharp/sharp/internal/Timer.cs +++ b/plugins/dali-sharp/sharp/internal/Timer.cs @@ -46,7 +46,7 @@ public class Timer : BaseHandle { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/TimerSignalType.cs b/plugins/dali-sharp/sharp/internal/TimerSignalType.cs index dd55b5a..0d427c6 100644 --- a/plugins/dali-sharp/sharp/internal/TimerSignalType.cs +++ b/plugins/dali-sharp/sharp/internal/TimerSignalType.cs @@ -28,7 +28,7 @@ public class TimerSignalType : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/ToggleButton.cs b/plugins/dali-sharp/sharp/internal/ToggleButton.cs index 914ed83..c4b3293 100644 --- a/plugins/dali-sharp/sharp/internal/ToggleButton.cs +++ b/plugins/dali-sharp/sharp/internal/ToggleButton.cs @@ -42,7 +42,7 @@ public class ToggleButton : Button { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/Touch.cs b/plugins/dali-sharp/sharp/internal/Touch.cs index 6644482..5bbf844 100644 --- a/plugins/dali-sharp/sharp/internal/Touch.cs +++ b/plugins/dali-sharp/sharp/internal/Touch.cs @@ -26,7 +26,7 @@ public class Touch : BaseHandle { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/TouchDataSignal.cs b/plugins/dali-sharp/sharp/internal/TouchDataSignal.cs index 8cc8d78..cc24307 100644 --- a/plugins/dali-sharp/sharp/internal/TouchDataSignal.cs +++ b/plugins/dali-sharp/sharp/internal/TouchDataSignal.cs @@ -28,7 +28,7 @@ internal class TouchDataSignal : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/TouchPoint.cs b/plugins/dali-sharp/sharp/internal/TouchPoint.cs index 1a695da..f4428fb 100644 --- a/plugins/dali-sharp/sharp/internal/TouchPoint.cs +++ b/plugins/dali-sharp/sharp/internal/TouchPoint.cs @@ -28,7 +28,7 @@ public class TouchPoint : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/TouchPointContainer.cs b/plugins/dali-sharp/sharp/internal/TouchPointContainer.cs index 41509fc..fba575f 100644 --- a/plugins/dali-sharp/sharp/internal/TouchPointContainer.cs +++ b/plugins/dali-sharp/sharp/internal/TouchPointContainer.cs @@ -30,7 +30,7 @@ public class TouchPointContainer : global::System.IDisposable, global::System.Co } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/TouchSignal.cs b/plugins/dali-sharp/sharp/internal/TouchSignal.cs index 1ef78d8..77486de 100644 --- a/plugins/dali-sharp/sharp/internal/TouchSignal.cs +++ b/plugins/dali-sharp/sharp/internal/TouchSignal.cs @@ -28,7 +28,7 @@ public class TouchSignal : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/TransitionData.cs b/plugins/dali-sharp/sharp/internal/TransitionData.cs index b13a8a3..0c7189e 100644 --- a/plugins/dali-sharp/sharp/internal/TransitionData.cs +++ b/plugins/dali-sharp/sharp/internal/TransitionData.cs @@ -42,7 +42,7 @@ public class TransitionData : BaseHandle { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/TypeInfo.cs b/plugins/dali-sharp/sharp/internal/TypeInfo.cs index 4219ac5..d5afa54 100644 --- a/plugins/dali-sharp/sharp/internal/TypeInfo.cs +++ b/plugins/dali-sharp/sharp/internal/TypeInfo.cs @@ -26,7 +26,7 @@ public class TypeInfo : BaseHandle { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/Uint16Pair.cs b/plugins/dali-sharp/sharp/internal/Uint16Pair.cs index 67b3f68..d444f92 100644 --- a/plugins/dali-sharp/sharp/internal/Uint16Pair.cs +++ b/plugins/dali-sharp/sharp/internal/Uint16Pair.cs @@ -28,7 +28,7 @@ public class Uint16Pair : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/Vector2.cs b/plugins/dali-sharp/sharp/internal/Vector2.cs index 64b5f1f..0ce99cd 100644 --- a/plugins/dali-sharp/sharp/internal/Vector2.cs +++ b/plugins/dali-sharp/sharp/internal/Vector2.cs @@ -28,7 +28,7 @@ public class Vector2 : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/Vector3.cs b/plugins/dali-sharp/sharp/internal/Vector3.cs index 27e5402..468d904 100644 --- a/plugins/dali-sharp/sharp/internal/Vector3.cs +++ b/plugins/dali-sharp/sharp/internal/Vector3.cs @@ -28,7 +28,7 @@ public class Vector3 : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/Vector4.cs b/plugins/dali-sharp/sharp/internal/Vector4.cs index d7726de..80c03f4 100644 --- a/plugins/dali-sharp/sharp/internal/Vector4.cs +++ b/plugins/dali-sharp/sharp/internal/Vector4.cs @@ -28,7 +28,7 @@ public class Vector4 : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/VectorFloat.cs b/plugins/dali-sharp/sharp/internal/VectorFloat.cs index acb8a05..1095042 100644 --- a/plugins/dali-sharp/sharp/internal/VectorFloat.cs +++ b/plugins/dali-sharp/sharp/internal/VectorFloat.cs @@ -28,7 +28,7 @@ public class VectorFloat : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/VectorInteger.cs b/plugins/dali-sharp/sharp/internal/VectorInteger.cs index 11c9297..2999a00 100644 --- a/plugins/dali-sharp/sharp/internal/VectorInteger.cs +++ b/plugins/dali-sharp/sharp/internal/VectorInteger.cs @@ -28,7 +28,7 @@ public class VectorInteger : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/VectorUint16Pair.cs b/plugins/dali-sharp/sharp/internal/VectorUint16Pair.cs index 46a4853..6a0675d 100644 --- a/plugins/dali-sharp/sharp/internal/VectorUint16Pair.cs +++ b/plugins/dali-sharp/sharp/internal/VectorUint16Pair.cs @@ -28,7 +28,7 @@ public class VectorUint16Pair : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/VectorUnsignedChar.cs b/plugins/dali-sharp/sharp/internal/VectorUnsignedChar.cs index 67255aa..17bd899 100644 --- a/plugins/dali-sharp/sharp/internal/VectorUnsignedChar.cs +++ b/plugins/dali-sharp/sharp/internal/VectorUnsignedChar.cs @@ -28,7 +28,7 @@ public class VectorUnsignedChar : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/VideoView.cs b/plugins/dali-sharp/sharp/internal/VideoView.cs index 1b61100..b6f392f 100644 --- a/plugins/dali-sharp/sharp/internal/VideoView.cs +++ b/plugins/dali-sharp/sharp/internal/VideoView.cs @@ -46,7 +46,7 @@ public class VideoView : View { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/VideoViewSignal.cs b/plugins/dali-sharp/sharp/internal/VideoViewSignal.cs index 04a8896..c3cadf4 100644 --- a/plugins/dali-sharp/sharp/internal/VideoViewSignal.cs +++ b/plugins/dali-sharp/sharp/internal/VideoViewSignal.cs @@ -28,7 +28,7 @@ public class VideoViewSignal : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/View.cs b/plugins/dali-sharp/sharp/internal/View.cs index aa1171f..a805550 100755 --- a/plugins/dali-sharp/sharp/internal/View.cs +++ b/plugins/dali-sharp/sharp/internal/View.cs @@ -49,7 +49,7 @@ namespace Dali public virtual void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; @@ -316,15 +316,15 @@ namespace Dali } /** - * @brief Event arguments that passed via OnStage signal + * @brief Event arguments that passed via OnWindow signal * */ - public class OnStageEventArgs : EventArgs + public class OnWindowEventArgs : EventArgs { private View _view; /** - * @brief View - is the view that is being connected to the stage + * @brief View - is the view that is being connected to the window * */ public View View @@ -341,15 +341,15 @@ namespace Dali } /** - * @brief Event arguments that passed via OffStage signal + * @brief Event arguments that passed via OffWindow signal * */ - public class OffStageEventArgs : EventArgs + public class OffWindowEventArgs : EventArgs { private View _view; /** - * @brief View - is the view that is being disconnected from the stage + * @brief View - is the view that is being disconnected from the window * */ public View View @@ -408,16 +408,16 @@ namespace Dali private WheelCallbackDelegate _viewWheelCallbackDelegate; [UnmanagedFunctionPointer(CallingConvention.StdCall)] - private delegate void OnStageEventCallbackDelegate(IntPtr control); + private delegate void OnWindowEventCallbackDelegate(IntPtr control); - private DaliEventHandler _viewOnStageEventHandler; - private OnStageEventCallbackDelegate _viewOnStageEventCallbackDelegate; + private DaliEventHandler _viewOnWindowEventHandler; + private OnWindowEventCallbackDelegate _viewOnWindowEventCallbackDelegate; [UnmanagedFunctionPointer(CallingConvention.StdCall)] - private delegate void OffStageEventCallbackDelegate(IntPtr control); + private delegate void OffWindowEventCallbackDelegate(IntPtr control); - private DaliEventHandler _viewOffStageEventHandler; - private OffStageEventCallbackDelegate _viewOffStageEventCallbackDelegate; + private DaliEventHandler _viewOffWindowEventHandler; + private OffWindowEventCallbackDelegate _viewOffWindowEventCallbackDelegate; /** * @brief Event for KeyInputFocusGained signal which can be used to subscribe/unsubscribe the event handler @@ -787,23 +787,23 @@ namespace Dali } /** - * @brief Event for OnStage signal which can be used to subscribe/unsubscribe the event handler - * (in the type of OnStageEventHandler) provided by the user. - * OnStage signal is emitted after the view has been connected to the stage. + * @brief Event for OnWindow signal which can be used to subscribe/unsubscribe the event handler + * (in the type of OnWindowEventHandler) provided by the user. + * OnWindow signal is emitted after the view has been connected to the window. */ - public event DaliEventHandler OnStageEvent + public event DaliEventHandler OnWindowEvent { add { lock (this) { // Restricted to only one listener - if (_viewOnStageEventHandler == null) + if (_viewOnWindowEventHandler == null) { - _viewOnStageEventHandler += value; + _viewOnWindowEventHandler += value; - _viewOnStageEventCallbackDelegate = new OnStageEventCallbackDelegate(OnStage); - this.OnStageSignal().Connect(_viewOnStageEventCallbackDelegate); + _viewOnWindowEventCallbackDelegate = new OnWindowEventCallbackDelegate(OnWindow); + this.OnWindowSignal().Connect(_viewOnWindowEventCallbackDelegate); } } } @@ -812,51 +812,51 @@ namespace Dali { lock (this) { - if (_viewOnStageEventHandler != null) + if (_viewOnWindowEventHandler != null) { - this.OnStageSignal().Disconnect(_viewOnStageEventCallbackDelegate); + this.OnWindowSignal().Disconnect(_viewOnWindowEventCallbackDelegate); } - _viewOnStageEventHandler -= value; + _viewOnWindowEventHandler -= value; } } } - // Callback for View OnStage signal - private void OnStage(IntPtr data) + // Callback for View OnWindow signal + private void OnWindow(IntPtr data) { - OnStageEventArgs e = new OnStageEventArgs(); + OnWindowEventArgs e = new OnWindowEventArgs(); - // Populate all members of "e" (OnStageEventArgs) with real data + // Populate all members of "e" (OnWindowEventArgs) with real data e.View = View.GetViewFromPtr(data); - //Console.WriteLine("############# OnStage()! e.View.Name=" + e.View.Name); + //Console.WriteLine("############# OnWindow()! e.View.Name=" + e.View.Name); - if (_viewOnStageEventHandler != null) + if (_viewOnWindowEventHandler != null) { //here we send all data to user event handlers - _viewOnStageEventHandler(this, e); + _viewOnWindowEventHandler(this, e); } } /** - * @brief Event for OffStage signal which can be used to subscribe/unsubscribe the event handler - * (in the type of OffStageEventHandler) provided by the user. - * OffStage signal is emitted after the view has been disconnected from the stage. + * @brief Event for OffWindow signal which can be used to subscribe/unsubscribe the event handler + * (in the type of OffWindowEventHandler) provided by the user. + * OffWindow signal is emitted after the view has been disconnected from the window. */ - public event DaliEventHandler OffStageEvent + public event DaliEventHandler OffWindowEvent { add { lock (this) { // Restricted to only one listener - if (_viewOffStageEventHandler == null) + if (_viewOffWindowEventHandler == null) { - _viewOffStageEventHandler += value; + _viewOffWindowEventHandler += value; - _viewOffStageEventCallbackDelegate = new OffStageEventCallbackDelegate(OffStage); - this.OnStageSignal().Connect(_viewOffStageEventCallbackDelegate); + _viewOffWindowEventCallbackDelegate = new OffWindowEventCallbackDelegate(OffWindow); + this.OnWindowSignal().Connect(_viewOffWindowEventCallbackDelegate); } } } @@ -865,28 +865,28 @@ namespace Dali { lock (this) { - if (_viewOffStageEventHandler != null) + if (_viewOffWindowEventHandler != null) { - this.OnStageSignal().Disconnect(_viewOffStageEventCallbackDelegate); + this.OnWindowSignal().Disconnect(_viewOffWindowEventCallbackDelegate); } - _viewOffStageEventHandler -= value; + _viewOffWindowEventHandler -= value; } } } - // Callback for View OffStage signal - private void OffStage(IntPtr data) + // Callback for View OffWindow signal + private void OffWindow(IntPtr data) { - OffStageEventArgs e = new OffStageEventArgs(); + OffWindowEventArgs e = new OffWindowEventArgs(); - // Populate all members of "e" (OffStageEventArgs) with real data + // Populate all members of "e" (OffWindowEventArgs) with real data e.View = View.GetViewFromPtr(data); - if (_viewOffStageEventHandler != null) + if (_viewOffWindowEventHandler != null) { //here we send all data to user event handlers - _viewOffStageEventHandler(this, e); + _viewOffWindowEventHandler(this, e); } } @@ -1123,7 +1123,7 @@ namespace Dali if (!view) { - view = Stage.Instance.GetRootLayer().FindChildById(id); + view = Window.Instance.GetRootLayer().FindChildById(id); } return view; @@ -1571,7 +1571,7 @@ namespace Dali /** * @brief The left focusable view. * @note This will return NULL if not set. - * This will also return NULL if the specified left focusable view is not on stage. + * This will also return NULL if the specified left focusable view is not on window. * */ public View LeftFocusableView @@ -1594,7 +1594,7 @@ namespace Dali /** * @brief The right focusable view. * @note This will return NULL if not set. - * This will also return NULL if the specified right focusable view is not on stage. + * This will also return NULL if the specified right focusable view is not on window. * */ public View RightFocusableView @@ -1617,7 +1617,7 @@ namespace Dali /** * @brief The up focusable view. * @note This will return NULL if not set. - * This will also return NULL if the specified up focusable view is not on stage. + * This will also return NULL if the specified up focusable view is not on window. * */ public View UpFocusableView @@ -1640,7 +1640,7 @@ namespace Dali /** * @brief The down focusable view. * @note This will return NULL if not set. - * This will also return NULL if the specified down focusable view is not on stage. + * This will also return NULL if the specified down focusable view is not on window. * */ public View DownFocusableView @@ -1770,11 +1770,11 @@ namespace Dali } } - public bool IsOnStage + public bool IsOnWindow { get { - return OnStage(); + return OnWindow(); } } @@ -1867,7 +1867,7 @@ namespace Dali return ret; } - public bool OnStage() + public bool OnWindow() { bool ret = NDalicPINVOKE.Actor_OnStage(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) @@ -2573,7 +2573,7 @@ namespace Dali return ret; } - public ViewSignal OnStageSignal() + public ViewSignal OnWindowSignal() { ViewSignal ret = new ViewSignal(NDalicPINVOKE.Actor_OnStageSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) diff --git a/plugins/dali-sharp/sharp/internal/ViewContainer.cs b/plugins/dali-sharp/sharp/internal/ViewContainer.cs index b3532f7..76251e6 100644 --- a/plugins/dali-sharp/sharp/internal/ViewContainer.cs +++ b/plugins/dali-sharp/sharp/internal/ViewContainer.cs @@ -30,7 +30,7 @@ public class ViewContainer : global::System.IDisposable, global::System.Collecti } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/ViewSignal.cs b/plugins/dali-sharp/sharp/internal/ViewSignal.cs index 6f9c172..19ce910 100644 --- a/plugins/dali-sharp/sharp/internal/ViewSignal.cs +++ b/plugins/dali-sharp/sharp/internal/ViewSignal.cs @@ -28,7 +28,7 @@ public class ViewSignal : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/ViewWrapper.cs b/plugins/dali-sharp/sharp/internal/ViewWrapper.cs index bcc54ec..80596a0 100755 --- a/plugins/dali-sharp/sharp/internal/ViewWrapper.cs +++ b/plugins/dali-sharp/sharp/internal/ViewWrapper.cs @@ -38,7 +38,7 @@ namespace Dali public override void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; diff --git a/plugins/dali-sharp/sharp/internal/ViewWrapperImpl.cs b/plugins/dali-sharp/sharp/internal/ViewWrapperImpl.cs index f4a6b26..15ac680 100644 --- a/plugins/dali-sharp/sharp/internal/ViewWrapperImpl.cs +++ b/plugins/dali-sharp/sharp/internal/ViewWrapperImpl.cs @@ -115,7 +115,7 @@ namespace Dali public override void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; diff --git a/plugins/dali-sharp/sharp/internal/VisualBase.cs b/plugins/dali-sharp/sharp/internal/VisualBase.cs index 92dca4d..e27a61d 100644 --- a/plugins/dali-sharp/sharp/internal/VisualBase.cs +++ b/plugins/dali-sharp/sharp/internal/VisualBase.cs @@ -26,7 +26,7 @@ public class VisualBase : BaseHandle { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/VisualFactory.cs b/plugins/dali-sharp/sharp/internal/VisualFactory.cs index 217079f..1a91463 100644 --- a/plugins/dali-sharp/sharp/internal/VisualFactory.cs +++ b/plugins/dali-sharp/sharp/internal/VisualFactory.cs @@ -26,7 +26,7 @@ public class VisualFactory : BaseHandle { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/VoidSignal.cs b/plugins/dali-sharp/sharp/internal/VoidSignal.cs index b7cb4d2..f19a51a 100644 --- a/plugins/dali-sharp/sharp/internal/VoidSignal.cs +++ b/plugins/dali-sharp/sharp/internal/VoidSignal.cs @@ -28,7 +28,7 @@ public class VoidSignal : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/Wheel.cs b/plugins/dali-sharp/sharp/internal/Wheel.cs index 6c0cf40..1c8071c 100644 --- a/plugins/dali-sharp/sharp/internal/Wheel.cs +++ b/plugins/dali-sharp/sharp/internal/Wheel.cs @@ -28,7 +28,7 @@ public class Wheel : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/WheelSignal.cs b/plugins/dali-sharp/sharp/internal/WheelSignal.cs index ae88c6f..e31658f 100644 --- a/plugins/dali-sharp/sharp/internal/WheelSignal.cs +++ b/plugins/dali-sharp/sharp/internal/WheelSignal.cs @@ -28,7 +28,7 @@ internal class WheelSignal : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/plugins/dali-sharp/sharp/internal/Window.cs b/plugins/dali-sharp/sharp/internal/Window.cs index a53e14c..196cd47 100644 --- a/plugins/dali-sharp/sharp/internal/Window.cs +++ b/plugins/dali-sharp/sharp/internal/Window.cs @@ -31,9 +31,11 @@ namespace Dali { public class Window : BaseHandle { private global::System.Runtime.InteropServices.HandleRef swigCPtr; + private global::System.Runtime.InteropServices.HandleRef stageCPtr; internal Window(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Window_SWIGUpcast(cPtr), cMemoryOwn) { swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); + stageCPtr = new global::System.Runtime.InteropServices.HandleRef(this, NDalicPINVOKE.Stage_GetCurrent()); } internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Window obj) { @@ -45,7 +47,7 @@ public class Window : BaseHandle { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } @@ -55,6 +57,7 @@ public class Window : BaseHandle { if (swigCMemOwn) { swigCMemOwn = false; NDalicPINVOKE.delete_Window(swigCPtr); + NDalicPINVOKE.delete_Stage(stageCPtr); } swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); } @@ -64,7 +67,11 @@ public class Window : BaseHandle { } - + public static bool IsInstalled() { + bool ret = NDalicPINVOKE.Stage_IsInstalled(); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } public void SetAcceptFocus( bool accept ) { NDalicPINVOKE.SetAcceptFocus(swigCPtr, accept); @@ -251,6 +258,160 @@ public class Window : BaseHandle { return ret; } + public Layer GetDefaultLayer() + { + return this.GetRootLayer(); + } + + public void Add(Layer layer) + { + NDalicPINVOKE.Stage_Add(stageCPtr, Layer.getCPtr(layer)); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public void Remove(Layer layer) + { + NDalicPINVOKE.Stage_Remove(stageCPtr, Layer.getCPtr(layer)); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public void Add(View view) { + NDalicPINVOKE.Stage_Add(stageCPtr, View.getCPtr(view)); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public void Remove(View view) { + NDalicPINVOKE.Stage_Remove(stageCPtr, View.getCPtr(view)); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public Vector2 GetSize() { + Vector2 ret = new Vector2(NDalicPINVOKE.Stage_GetSize(stageCPtr), true); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + public RenderTaskList GetRenderTaskList() { + RenderTaskList ret = new RenderTaskList(NDalicPINVOKE.Stage_GetRenderTaskList(stageCPtr), true); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + public uint GetLayerCount() { + uint ret = NDalicPINVOKE.Stage_GetLayerCount(stageCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + public Layer GetLayer(uint depth) { + Layer ret = new Layer(NDalicPINVOKE.Stage_GetLayer(stageCPtr, depth), true); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + public Layer GetRootLayer() { + Layer ret = new Layer(NDalicPINVOKE.Stage_GetRootLayer(stageCPtr), true); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + public void SetBackgroundColor(Vector4 color) { + NDalicPINVOKE.Stage_SetBackgroundColor(stageCPtr, Vector4.getCPtr(color)); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public Vector4 GetBackgroundColor() { + Vector4 ret = new Vector4(NDalicPINVOKE.Stage_GetBackgroundColor(stageCPtr), true); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + public Vector2 GetDpi() { + Vector2 ret = new Vector2(NDalicPINVOKE.Stage_GetDpi(stageCPtr), true); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + public ObjectRegistry GetObjectRegistry() { + ObjectRegistry ret = new ObjectRegistry(NDalicPINVOKE.Stage_GetObjectRegistry(stageCPtr), true); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + public void KeepRendering(float durationSeconds) { + NDalicPINVOKE.Stage_KeepRendering(stageCPtr, durationSeconds); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public KeyEventSignal KeyEventSignal() { + KeyEventSignal ret = new KeyEventSignal(NDalicPINVOKE.Stage_KeyEventSignal(stageCPtr), false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + public VoidSignal EventProcessingFinishedSignal() { + VoidSignal ret = new VoidSignal(NDalicPINVOKE.Stage_EventProcessingFinishedSignal(stageCPtr), false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + public TouchSignal TouchSignal() { + TouchSignal ret = new TouchSignal(NDalicPINVOKE.Stage_TouchSignal(stageCPtr), false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + private StageWheelSignal WheelEventSignal() { + StageWheelSignal ret = new StageWheelSignal(NDalicPINVOKE.Stage_WheelEventSignal(stageCPtr), false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + public VoidSignal ContextLostSignal() { + VoidSignal ret = new VoidSignal(NDalicPINVOKE.Stage_ContextLostSignal(stageCPtr), false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + public VoidSignal ContextRegainedSignal() { + VoidSignal ret = new VoidSignal(NDalicPINVOKE.Stage_ContextRegainedSignal(stageCPtr), false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + public VoidSignal SceneCreatedSignal() { + VoidSignal ret = new VoidSignal(NDalicPINVOKE.Stage_SceneCreatedSignal(stageCPtr), false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + public static Vector4 DEFAULT_BACKGROUND_COLOR { + get { + global::System.IntPtr cPtr = NDalicPINVOKE.Stage_DEFAULT_BACKGROUND_COLOR_get(); + Vector4 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector4(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + + public static Vector4 DEBUG_BACKGROUND_COLOR { + get { + global::System.IntPtr cPtr = NDalicPINVOKE.Stage_DEBUG_BACKGROUND_COLOR_get(); + Vector4 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector4(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + + private static readonly Window instance = Application.Instance.GetWindow(); + public static Window Instance + { + get + { + return instance; + } + } + public enum WindowOrientation { PORTRAIT = 0, LANDSCAPE = 90, @@ -270,6 +431,422 @@ public class Window : BaseHandle { AUTO = 2 } + + + /** + * @brief Event arguments that passed via Touch signal + * + */ + public class TouchEventArgs : EventArgs + { + private Touch _touch; + + /** + * @brief Touch - contains the information of touch points + * + */ + public Touch Touch + { + get + { + return _touch; + } + set + { + _touch = value; + } + } + } + + private event EventHandler _stageTouchHandler; + private EventCallbackDelegateType1 _stageTouchCallbackDelegate; + + /** + * @brief Event for TouchEvent signal which can be used to subscribe/unsubscribe the event handler + * TouchEvent signal is emitted when the screen is touched and when the touch ends + * (i.e. the down & up touch events only). + * + */ + public event EventHandler Touch + { + add + { + lock(this) + { + _stageTouchHandler += value; + _stageTouchCallbackDelegate = OnStageTouch; + this.TouchSignal().Connect(_stageTouchCallbackDelegate); + } + } + remove + { + lock(this) + { + if (_stageTouchHandler != null) + { + this.TouchSignal().Disconnect(_stageTouchCallbackDelegate); + } + _stageTouchHandler -= value; + } + } + } + + private void OnStageTouch(IntPtr data) + { + TouchEventArgs e = new TouchEventArgs(); + + if( data != null ) + { + e.Touch = Dali.Touch.GetTouchFromPtr( data ); + } + + if (_stageTouchHandler != null) + { + _stageTouchHandler(this, e); + } + } + + /** + * @brief Wheel arguments that passed via Wheel signal + * + */ + public class WheelEventArgs : EventArgs + { + private Wheel _wheel; + + /** + * @brief Wheel - store a wheel rolling type MOUSE_WHEEL or CUSTOM_WHEEL + * + */ + public Wheel Wheel + { + get + { + return _wheel; + } + set + { + _wheel = value; + } + } + } + + private event EventHandler _stageWheelHandler; + private EventCallbackDelegateType1 _stageWheelCallbackDelegate; + + /** + * @brief Event for Wheel signal which can be used to subscribe/unsubscribe the event handler + * Wheel signal is emitted is emitted when wheel event is received. + * + */ + public event EventHandler Wheel + { + add + { + lock(this) + { + _stageWheelHandler += value; + _stageWheelCallbackDelegate = OnStageWheel; + this.WheelEventSignal().Connect(_stageWheelCallbackDelegate); + } + } + remove + { + lock(this) + { + if (_stageWheelHandler != null) + { + this.WheelEventSignal().Disconnect(_stageWheelCallbackDelegate); + } + _stageWheelHandler -= value; + } + } + } + + private void OnStageWheel(IntPtr data) + { + WheelEventArgs e = new WheelEventArgs(); + + if( data != null ) + { + e.Wheel = Dali.Wheel.GetWheelFromPtr( data ); + } + + if (_stageWheelHandler != null) + { + _stageWheelHandler(this, e); + } + } + + /** + * @brief Event arguments that passed via Key signal + * + */ + public class KeyEventArgs : EventArgs + { + private Key _key; + + /** + * @brief Key - is the keyevent sent to Stage. + * + */ + public Key Key + { + get + { + return _key; + } + set + { + _key = value; + } + } + } + + private event EventHandler _stageKeyHandler; + private EventCallbackDelegateType1 _stageKeyCallbackDelegate; + + /** + * @brief Event for Key signal which can be used to subscribe/unsubscribe the event handler + * Key signal is emitted is emitted when key event is received. + * + */ + public event EventHandler Key + { + add + { + lock(this) + { + _stageKeyHandler += value; + _stageKeyCallbackDelegate = OnStageKey; + this.KeyEventSignal().Connect(_stageKeyCallbackDelegate); + } + } + remove + { + lock(this) + { + if (_stageKeyHandler != null) + { + this.KeyEventSignal().Disconnect(_stageKeyCallbackDelegate); + } + _stageKeyHandler -= value; + } + } + } + + // Callback for Stage KeyEventsignal + private void OnStageKey(IntPtr data) + { + KeyEventArgs e = new KeyEventArgs(); + + if( data != null ) + { + e.Key = Dali.Key.GetKeyFromPtr( data ); + } + + if (_stageKeyHandler != null) + { + //here we send all data to user event handlers + _stageKeyHandler(this, e); + } + } + + + private event EventHandler _stageEventProcessingFinishedEventHandler; + private EventCallbackDelegateType0 _stageEventProcessingFinishedEventCallbackDelegate; + + /** + * @brief Event for EventProcessingFinished signal which can be used to subscribe/unsubscribe the event handler + * provided by the user. EventProcessingFinished signal is emitted just after the event processing is finished. + * + */ + public event EventHandler EventProcessingFinished + { + add + { + lock(this) + { + _stageEventProcessingFinishedEventHandler += value; + _stageEventProcessingFinishedEventCallbackDelegate = OnEventProcessingFinished; + this.EventProcessingFinishedSignal().Connect(_stageEventProcessingFinishedEventCallbackDelegate); + } + } + remove + { + lock(this) + { + if (_stageEventProcessingFinishedEventHandler != null) + { + this.EventProcessingFinishedSignal().Disconnect(_stageEventProcessingFinishedEventCallbackDelegate); + } + _stageEventProcessingFinishedEventHandler -= value; + } + } + } + + // Callback for Stage EventProcessingFinishedSignal + private void OnEventProcessingFinished() + { + if (_stageEventProcessingFinishedEventHandler != null) + { + _stageEventProcessingFinishedEventHandler(this, null); + } + } + + + private EventHandler _stageContextLostEventHandler; + private EventCallbackDelegateType0 _stageContextLostEventCallbackDelegate; + + /** + * @brief Event for ContextLost signal which can be used to subscribe/unsubscribe the event handler + * ContextLost signal is emitted when the GL context is lost (Platform specific behaviour). + * + */ + public event EventHandler ContextLost + { + add + { + lock(this) + { + _stageContextLostEventHandler += value; + _stageContextLostEventCallbackDelegate = OnContextLost; + this.ContextLostSignal().Connect(_stageContextLostEventCallbackDelegate); + } + } + remove + { + lock(this) + { + if (_stageContextLostEventHandler != null) + { + this.ContextLostSignal().Disconnect(_stageContextLostEventCallbackDelegate); + } + + _stageContextLostEventHandler -= value; + } + } + } + + // Callback for Stage ContextLostSignal + private void OnContextLost() + { + if (_stageContextLostEventHandler != null) + { + _stageContextLostEventHandler(this, null); + } + } + + + private EventHandler _stageContextRegainedEventHandler; + private EventCallbackDelegateType0 _stageContextRegainedEventCallbackDelegate; + + /** + * @brief Event for ContextRegained signal which can be used to subscribe/unsubscribe the event handler + * provided by the user. ContextRegained signal is emitted when the GL context is regained (Platform specific + * behaviour). + * + */ + public event EventHandler ContextRegained + { + add + { + lock(this) + { + _stageContextRegainedEventHandler += value; + _stageContextRegainedEventCallbackDelegate = OnContextRegained; + this.ContextRegainedSignal().Connect(_stageContextRegainedEventCallbackDelegate); + } + } + remove + { + lock(this) + { + if (_stageContextRegainedEventHandler != null) + { + this.ContextRegainedSignal().Disconnect(_stageContextRegainedEventCallbackDelegate); + } + + _stageContextRegainedEventHandler -= value; + } + } + } + + // Callback for Stage ContextRegainedSignal + private void OnContextRegained() + { + if (_stageContextRegainedEventHandler != null) + { + _stageContextRegainedEventHandler(this, null); + } + } + + + private EventHandler _stageSceneCreatedEventHandler; + private EventCallbackDelegateType0 _stageSceneCreatedEventCallbackDelegate; + + /** + * @brief Event for SceneCreated signal which can be used to subscribe/unsubscribe the event handler + * SceneCreated signal is emitted after the initial scene is created. + * + */ + public event EventHandler SceneCreated + { + add + { + lock(this) + { + _stageSceneCreatedEventHandler += value; + _stageSceneCreatedEventCallbackDelegate = OnSceneCreated; + this.SceneCreatedSignal().Connect(_stageSceneCreatedEventCallbackDelegate); + } + } + remove + { + lock(this) + { + if (_stageSceneCreatedEventHandler != null) + { + this.SceneCreatedSignal().Disconnect(_stageSceneCreatedEventCallbackDelegate); + } + + _stageSceneCreatedEventHandler -= value; + } + } + } + + // Callback for Stage SceneCreatedSignal + private void OnSceneCreated() + { + if (_stageSceneCreatedEventHandler != null) + { + _stageSceneCreatedEventHandler(this, null); + } + } + + + public Vector2 Size + { + get + { + Vector2 ret = GetSize(); + return ret; + } + } + + public Vector4 BackgroundColor + { + set + { + SetBackgroundColor(value); + } + get + { + Vector4 ret = GetBackgroundColor(); + return ret; + } + } + } }