[NUI] Fix svace issue (DFDF221207-00724).

[platform/core/csapi/tizenfx.git] / src / Tizen.NUI / src / public / Window / Window.cs

diff --git a/src/Tizen.NUI/src/public/Window/Window.cs b/src/Tizen.NUI/src/public/Window/Window.cs
index f0e9568..796b7b9 100755 (executable)
--- a/src/Tizen.NUI/src/public/Window/Window.cs
+++ b/src/Tizen.NUI/src/public/Window/Window.cs
@@ -54,9 +54,7 @@ namespace Tizen.NUI
             }
             return isSupported;
         }
-#if NUI_PROPERTY_CHANGE_DEBUG
-private bool flag1 = false;
-#endif
+
         internal Window(global::System.IntPtr cPtr, bool cMemoryOwn) : base(cPtr, cMemoryOwn)
         {
             if (Interop.Stage.IsInstalled())
@@ -65,51 +63,9 @@ private bool flag1 = false;
 
                 localController = new LayoutController(this);
                 NUILog.Debug("layoutController id:" + localController.GetId());
-
-#if NUI_PROPERTY_CHANGE_DEBUG
-Tizen.Log.Fatal("NUITEST", $"Window constructor called!");
-if(flag1 == false)
-{
-    flag1 = true;
-    var curTh = global::System.Threading.Thread.CurrentThread.ManagedThreadId;
-    Tizen.Log.Fatal("NUITEST", $"current threadID : {curTh}");
-    if(curTh == 1)
-    {
-        this.KeyEvent += TestWindowKeyEventHandler;
-        Tizen.Log.Fatal("NUITEST", $"TestWindowKeyEventHandler() added");
-    }
-}
-#endif
-
             }
         }
 
-#if NUI_PROPERTY_CHANGE_DEBUG
-private void TestWindowKeyEventHandler(object o, Window.KeyEventArgs e)
-{
-    if(e.Key.State == Key.StateType.Down && e.Key.KeyPressedName == "1")
-    {
-#if NUI_PROPERTY_CHANGE_1
-        Tizen.Log.Fatal("NUITEST", $"### (FIXED) currently used View's properties ###");
-#else
-        Tizen.Log.Fatal("NUITEST", $"### currently used View's properties ###");
-#endif
-        Tizen.Log.Fatal("NUITEST", $"PropertyValueConstructor: {Tizen.NUI.PropertyValue.PropertyValueConstructor}");
-        Tizen.Log.Fatal("NUITEST", $"SizeGetter: {View.SizeGetter}, SizeSetter: {View.SizeSetter}");
-        Tizen.Log.Fatal("NUITEST", $"Size2DGetter: {View.Size2DGetter}, Size2DSetter: {View.Size2DSetter}");
-        Tizen.Log.Fatal("NUITEST", $"SizeWidthGetter: {View.SizeWidthGetter}, SizeWidthSetter: {View.SizeWidthSetter}");
-        Tizen.Log.Fatal("NUITEST", $"SizeHeightGetter: {View.SizeHeightGetter}, SizeHeightSetter: {View.SizeHeightSetter}");
-        Tizen.Log.Fatal("NUITEST", $"PositionGetter: {View.PositionGetter}, PositionSetter: {View.PositionSetter}");
-        Tizen.Log.Fatal("NUITEST", $"Position2DGetter: {View.Position2DGetter}, Position2DSetter: {View.Position2DSetter}");
-        Tizen.Log.Fatal("NUITEST", $"PositionXGetter: {View.PositionXGetter}, PositionXSetter: {View.PositionXSetter}");
-        Tizen.Log.Fatal("NUITEST", $"PositionYGetter: {View.PositionYGetter}, PositionYSetter: {View.PositionYSetter}");
-        Tizen.Log.Fatal("NUITEST", $"PositionZGetter: {View.PositionZGetter}, PositionZSetter: {View.PositionZSetter}");
-        Tizen.Log.Fatal("NUITEST", $"MaximumSizeGetter: {View.MaximumSizeGetter}, MaximumSizeSetter: {View.MaximumSizeSetter}");
-        Tizen.Log.Fatal("NUITEST", $"MinimumSizeGetter: {View.MinimumSizeGetter}, MinimumSizeSetter: {View.MinimumSizeSetter}");
-    }
-}
-#endif
-
         /// <summary>
         /// A helper method to get the current window where the view is added
         /// </summary>
@@ -126,7 +82,7 @@ private void TestWindowKeyEventHandler(object o, Window.KeyEventArgs e)
 
             //to fix memory leak issue, match the handle count with native side.
             Window ret = view.GetInstanceSafely<Window>(Interop.Window.Get(View.getCPtr(view)));
-            if (NDalicPINVOKE.SWIGPendingException.Pending)throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             return ret;
         }
 
@@ -596,7 +552,7 @@ private void TestWindowKeyEventHandler(object o, Window.KeyEventArgs e)
             {
                 Position2D position = GetPosition();
                 Size2D size = GetSize();
-                Rectangle ret = new Rectangle(position.X, position.Y, size.Width, size.Height);
+                Rectangle ret = new Rectangle(position?.X ?? 0, position?.Y ?? 0, size?.Width ?? 0, size?.Height ?? 0);
                 position.Dispose();
                 return ret;
             }
@@ -1471,7 +1427,7 @@ private void TestWindowKeyEventHandler(object o, Window.KeyEventArgs e)
         {
             if (isBorderWindow)
             {
-                if(borderLayer == null)
+                if (borderLayer == null)
                 {
                     borderLayer = GetBorderWindowRootLayer();
                     LayersChildren?.Add(borderLayer);
@@ -1569,8 +1525,8 @@ private void TestWindowKeyEventHandler(object o, Window.KeyEventArgs e)
             {
                 throw new ArgumentNullException(nameof(position));
             }
-            var val = new IntPair(position.X, position.Y);
-            Interop.Window.SetPosition(SwigCPtr, IntPair.getCPtr(val));
+            var val = new Int32Pair(position.X, position.Y);
+            Interop.Window.SetPosition(SwigCPtr, Int32Pair.getCPtr(val));
             val.Dispose();
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             // Setting Position of the window should request a relayout of the tree.
@@ -1578,7 +1534,7 @@ private void TestWindowKeyEventHandler(object o, Window.KeyEventArgs e)
 
         internal Position2D GetPosition()
         {
-            var val = new IntPair(Interop.Window.GetPosition(SwigCPtr), true);
+            var val = new Int32Pair(Interop.Window.GetPosition(SwigCPtr), true);
             Position2D ret = new Position2D((int)val.GetX(), (int)val.GetY());
             val.Dispose();
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
@@ -1841,6 +1797,8 @@ private void TestWindowKeyEventHandler(object o, Window.KeyEventArgs e)
             {
                 return;
             }
+            
+            this.DisconnectNativeSignals();
 
             if (type == DisposeTypes.Explicit)
             {
@@ -1866,7 +1824,6 @@ private void TestWindowKeyEventHandler(object o, Window.KeyEventArgs e)
                 localController?.Dispose();
             }
 
-            this.DisconnectNativeSignals();
 
             base.Dispose(type);
         }