[Tizen] Version 54 integration

Included patches of devel/master branch:
1. Fix Window Set/Get Size/Position (I87bec91a5ba2a1bcf20cb66c567f432a2a8d1d3d)
2. call base.OnXXX when getting lifecycle callback (I3e08f8c6a04f00bba07993cc07be2bbf32b5cc42)
3. Add Window.Title property. (Idec1c8de60220eba153f2e980dfeda903b7c1ab9)
4. Fix issue of VisualMaps and VisualView (I24fec154dbe0562eaa27b97cf01ae47570df68ad)

Change-Id: I1bef06bf161eb1a962c0f77599959e1a5147296b
Signed-off-by: dongsug.song <dongsug.song@samsung.com>

diff --git a/packaging/csapi-nui.spec b/packaging/csapi-nui.spec
index b6cf5566f010ce72bb672ee15c815fa957e25fcc..1dfb927834e6a8dd2d768a0a4567a735fa0c992c 100755 (executable)
--- a/packaging/csapi-nui.spec
+++ b/packaging/csapi-nui.spec
@@ -1,6 +1,6 @@
 Name:       csapi-nui
 Summary:    dali-NUI
-Version:    0.2.52
+Version:    0.2.54
 Release:    1
 License:    Apache-2.0 and BSD-3-Clause and MIT
 URL:        https://www.tizen.org

diff --git a/src/Tizen.NUI/Tizen.NUI.csproj b/src/Tizen.NUI/Tizen.NUI.csproj
index 9b983d6913de71a13fa472cd320dc3d316686433..80d7cb80d5e5e5501d706b051dd18c73c150d2a4 100755 (executable)
--- a/src/Tizen.NUI/Tizen.NUI.csproj
+++ b/src/Tizen.NUI/Tizen.NUI.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">\r
 \r
   <PropertyGroup>\r
-    <Version>0.2.52</Version>\r
+    <Version>0.2.54</Version>\r
     <Authors>Samsung Electronics</Authors>\r
     <Copyright>© Samsung Electronics Co., Ltd All Rights Reserved</Copyright>\r
     <Description>\r

diff --git a/src/Tizen.NUI/src/internal/SWIGTYPE_p_f_p_Dali__BaseObject_p_Dali__ConnectionTrackerInterface.cs b/src/Tizen.NUI/src/internal/SWIGTYPE_p_f_p_Dali__BaseObject_p_Dali__ConnectionTrackerInterface.cs
new file mode 100755 (executable)
index 0000000..cce5fc9
--- /dev/null
+++ b/src/Tizen.NUI/src/internal/SWIGTYPE_p_f_p_Dali__BaseObject_p_Dali__ConnectionTrackerInterface.cs
@@ -0,0 +1,34 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+//
+// This file was automatically generated by SWIG (http://www.swig.org).
+// Version 3.0.9
+//
+// Do not make changes to this file unless you know what you are doing--modify
+// the SWIG interface file instead.
+//------------------------------------------------------------------------------
+
+namespace Tizen.NUI
+{
+
+    internal class SWIGTYPE_p_f_p_Dali__BaseObject_p_Dali__ConnectionTrackerInterface_r_q_const__std__string_p_Dali__FunctorDelegate__bool
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+
+        internal SWIGTYPE_p_f_p_Dali__BaseObject_p_Dali__ConnectionTrackerInterface_r_q_const__std__string_p_Dali__FunctorDelegate__bool(global::System.IntPtr cPtr, bool futureUse)
+        {
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+        }
+
+        protected SWIGTYPE_p_f_p_Dali__BaseObject_p_Dali__ConnectionTrackerInterface_r_q_const__std__string_p_Dali__FunctorDelegate__bool()
+        {
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+        }
+
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(SWIGTYPE_p_f_p_Dali__BaseObject_p_Dali__ConnectionTrackerInterface_r_q_const__std__string_p_Dali__FunctorDelegate__bool obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
+    }
+
+}

diff --git a/src/Tizen.NUI/src/internal/SWIGTYPE_p_f_p_Dali__BaseObject_p_Dali__ConnectionTrackerInterface_r_q_const__std__string_p_Dali__FunctorDelegate__bool.cs b/src/Tizen.NUI/src/internal/SWIGTYPE_p_f_p_Dali__BaseObject_p_Dali__ConnectionTrackerInterface_r_q_const__std__string_p_Dali__FunctorDelegate__bool.cs
deleted file mode 100755 (executable)
index cce5fc9..0000000
--- a/src/Tizen.NUI/src/internal/SWIGTYPE_p_f_p_Dali__BaseObject_p_Dali__ConnectionTrackerInterface_r_q_const__std__string_p_Dali__FunctorDelegate__bool.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated />
-//
-// This file was automatically generated by SWIG (http://www.swig.org).
-// Version 3.0.9
-//
-// Do not make changes to this file unless you know what you are doing--modify
-// the SWIG interface file instead.
-//------------------------------------------------------------------------------
-
-namespace Tizen.NUI
-{
-
-    internal class SWIGTYPE_p_f_p_Dali__BaseObject_p_Dali__ConnectionTrackerInterface_r_q_const__std__string_p_Dali__FunctorDelegate__bool
-    {
-        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-
-        internal SWIGTYPE_p_f_p_Dali__BaseObject_p_Dali__ConnectionTrackerInterface_r_q_const__std__string_p_Dali__FunctorDelegate__bool(global::System.IntPtr cPtr, bool futureUse)
-        {
-            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-        }
-
-        protected SWIGTYPE_p_f_p_Dali__BaseObject_p_Dali__ConnectionTrackerInterface_r_q_const__std__string_p_Dali__FunctorDelegate__bool()
-        {
-            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-        }
-
-        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(SWIGTYPE_p_f_p_Dali__BaseObject_p_Dali__ConnectionTrackerInterface_r_q_const__std__string_p_Dali__FunctorDelegate__bool obj)
-        {
-            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-        }
-    }
-
-}

diff --git a/src/Tizen.NUI/src/internal/dotnetcore/AddedException.cs b/src/Tizen.NUI/src/internal/dotnetcore/AddedException.cs
index a6acae71b47d1f993d37bad113db89dfdf8122e5..01525eda66c6d9928d5fa367ecb69ee0928b79ce 100755 (executable)
--- a/src/Tizen.NUI/src/internal/dotnetcore/AddedException.cs
+++ b/src/Tizen.NUI/src/internal/dotnetcore/AddedException.cs
@@ -20,17 +20,17 @@ namespace System
     {
         public ApplicationException(): base()
         {
-            //new global::System.ApplicationException();
+            //add anything required
         }
 
         public ApplicationException(string message): base(message)
         {
-            //new global::System.ApplicationException(message);
+            //add anything required
         }
 
         public ApplicationException(string message, Exception innerException): base(message, innerException)
         {
-            //new global::System.ApplicationException(message, innerException);
+            //add anything required
         }
     }
 
@@ -38,17 +38,17 @@ namespace System
     {
         public SystemException(): base()
         {
-            //new global::System.SystemException();
+            //add anything required
         }
 
         public SystemException(string message): base(message)
         {
-            //new global::System.SystemException(message);
+            //add anything required
         }
 
         public SystemException(string message, Exception innerException): base(message, innerException)
         {
-            //new global::System.SystemException(message, innerException);
+            //add anything required
         }
     }
 }

diff --git a/src/Tizen.NUI/src/public/BaseComponents/VisualView.cs b/src/Tizen.NUI/src/public/BaseComponents/VisualView.cs
index dc36895636ee8adc588c93cb034691ae7bd01ade..d33ce5dd1b42e3ea15dbdf54507f0816ba09272e 100755 (executable)
--- a/src/Tizen.NUI/src/public/BaseComponents/VisualView.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/VisualView.cs
@@ -57,7 +57,7 @@ namespace Tizen.NUI.BaseComponents
             CustomViewRegistry.Instance.Register(CreateInstance, typeof(VisualView));
         }
 
-        public VisualView() : base(typeof(VisualView).Name, CustomViewBehaviour.ViewBehaviourDefault)
+        public VisualView() : base(typeof(VisualView).FullName, CustomViewBehaviour.ViewBehaviourDefault)
         {
         }
 

diff --git a/src/Tizen.NUI/src/public/VisualMaps.cs b/src/Tizen.NUI/src/public/VisualMaps.cs
index 01098c35f4ce914ad7d72605a2eb56ce56dbbdcd..1c0584df1c61b95731f36da4dec618ca9d34cba5 100755 (executable)
--- a/src/Tizen.NUI/src/public/VisualMaps.cs
+++ b/src/Tizen.NUI/src/public/VisualMaps.cs
@@ -74,7 +74,7 @@ namespace Tizen.NUI
                 _visualSize = value;
                 if (_visualSizePolicy == null)
                 {
-                    _visualSizePolicy = new Vector2(0.0f, 0.0f);
+                    _visualSizePolicy = new Vector2(1.0f, 1.0f);
                 }
                 UpdateVisual();
             }
@@ -97,7 +97,7 @@ namespace Tizen.NUI
                 _visualOffset = value;
                 if (_visualOffsetPolicy == null)
                 {
-                    _visualOffsetPolicy = new Vector2(0.0f, 0.0f);
+                    _visualOffsetPolicy = new Vector2(1.0f, 1.0f);
                 }
                 UpdateVisual();
             }

diff --git a/src/Tizen.NUI/src/public/Window.cs b/src/Tizen.NUI/src/public/Window.cs
index a903fd6054d0af446223e4c49525134c67b89161..04b236955013a07cb4d680107a4dfa10b4d8d482 100755 (executable)
--- a/src/Tizen.NUI/src/public/Window.cs
+++ b/src/Tizen.NUI/src/public/Window.cs
@@ -30,6 +30,7 @@ namespace Tizen.NUI
         private global::System.Runtime.InteropServices.HandleRef swigCPtr;
         private global::System.Runtime.InteropServices.HandleRef stageCPtr;
         private Layer _rootLayer;
+        private string _windowTitle;
 
         internal Window(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Window_SWIGUpcast(cPtr), cMemoryOwn)
         {
@@ -429,6 +430,22 @@ namespace Tizen.NUI
             }
         }
 
+        /// <summary>
+        /// Gets/Sets a window title.
+        /// </summary>
+        public string Title
+        {
+            get
+            {
+                return _windowTitle;
+            }
+            set
+            {
+                _windowTitle = value;
+                SetClass( _windowTitle, "" );
+            }
+        }
+
         internal WindowFocusSignalType WindowFocusChangedSignal()
         {
             WindowFocusSignalType ret = new WindowFocusSignalType(NDalicPINVOKE.FocusChangedSignal(swigCPtr), false);