nui 0.2.33-pre1 updated

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

diff --git a/packaging/csapi-nui.spec b/packaging/csapi-nui.spec
index 0c2a580..22d8fe8 100755 (executable)
--- a/packaging/csapi-nui.spec
+++ b/packaging/csapi-nui.spec
@@ -1,7 +1,7 @@
 Name:       csapi-nui
 Summary:    dali-NUI
-Version:    0.2.32
-Release:    1
+Version:    0.2.33
+Release:    pre1
 Group:      Development/Libraries
 License:    Apache-2.0
 URL:        https://www.tizen.org
@@ -32,7 +32,7 @@ cp %{SOURCE1} .
 %build
 for ASM in %{Assemblies}; do
 %dotnet_build $ASM
-%dotnet_pack $ASM/$ASM.nuspec %{version}
+%dotnet_pack $ASM/$ASM.nuspec %{version}-pre1
 done
 
 %install

diff --git a/src/Tizen.NUI/Tizen.NUI.csproj b/src/Tizen.NUI/Tizen.NUI.csproj
index 7dd1b78..b37ba6b 100755 (executable)
--- a/src/Tizen.NUI/Tizen.NUI.csproj
+++ b/src/Tizen.NUI/Tizen.NUI.csproj
@@ -102,6 +102,7 @@
     <Compile Include="src\internal\doublep.cs" />\r
     <Compile Include="src\internal\DragAndDropDetector.cs" />\r
     <Compile Include="src\internal\EncodedBufferImage.cs" />\r
+    <Compile Include="src\internal\EventThreadCallback.cs" />\r
     <Compile Include="src\internal\FaceCullingModeType.cs" />\r
     <Compile Include="src\internal\FilterModeType.cs" />\r
     <Compile Include="src\internal\FittingModeType.cs" />\r

diff --git a/src/Tizen.NUI/src/internal/Application.cs b/src/Tizen.NUI/src/internal/Application.cs
index 4b91ba8..3b37876 100755 (executable)
--- a/src/Tizen.NUI/src/internal/Application.cs
+++ b/src/Tizen.NUI/src/internal/Application.cs
@@ -20,6 +20,10 @@ namespace Tizen.NUI
         public const int ver1 = 1;
         public const int ver2 = 2;
         public const int ver3 = 32;
+        public const int nuiVer1 = 0;
+        public const int nuiVer2 = 2;
+        public const int nuiVer3 = 33;
+        public const string nuiRelease = "-pre1";
     }
 
     /**
@@ -1080,19 +1084,19 @@ namespace Tizen.NUI
                     if (ver1 != Version.ver1 || ver2 != Version.ver2 || ver3 != Version.ver3)
                     {
                             //throw new System.InvalidOperationException("Dali native version mismatch error! nui=" + Version.ver1 + "." + Version.ver2 + "." + Version.ver3 + " but dali=" + ver1 + "." + ver2 + "." + ver3);
-                            Tizen.Log.Fatal("NUI", "Dali native version mismatch error! nui=" + Version.ver1 + "." + Version.ver2 + "." + Version.ver3 + " but dali=" + ver1 + "." + ver2 + "." + ver3);
+                            Tizen.Log.Fatal("NUI", "Dali native version mismatch error! nui=" + Version.nuiVer1 "." + Version.nuiVer2 + "." + Version.nuiVer3 + Version.nuiRelease + " but native dali=" + ver1 + "." + ver2 + "." + ver3);
                     }
                 }
                 else
                 {
                         //throw new System.InvalidOperationException("Dali native version mismatch error! nui=" + Version.ver1 + "." + Version.ver2 + "." + Version.ver3 + " but dali=" + ver1 + "." + ver2 + "." + ver3);
-                        Tizen.Log.Fatal("NUI", "Dali native version mismatch error! nui=" + Version.ver1 + "." + Version.ver2 + "." + Version.ver3 + " but dali=" + ver1 + "." + ver2 + "." + ver3);
+                        Tizen.Log.Fatal("NUI", "Dali native version mismatch error! nui=" + Version.nuiVer1 + "." + Version.nuiVer2 + "." + Version.nuiVer3 + Version.nuiRelease + " but native dali=" + ver1 + "." + ver2 + "." + ver3);
                     }
                 }
                 catch (Exception e)
                 {
                     //throw new System.InvalidOperationException("Dali native version is very old! nui=" + Version.ver1 + "." + Version.ver2 + "." + Version.ver3);
-                    Tizen.Log.Fatal("NUI", "Dali native version is very old! nui=" + Version.ver1 + "." + Version.ver2 + "." + Version.ver3);
+                    Tizen.Log.Fatal("NUI", "Dali native version is very old! nui=" + Version.nuiVer1 + "." + Version.nuiVer2 + "." + Version.nuiVer3 + Version.nuiRelease);
                 }
             }
 

diff --git a/src/Tizen.NUI/src/internal/ViewRegistry.cs b/src/Tizen.NUI/src/internal/ViewRegistry.cs
index bf1cb80..ee3cc03 100755 (executable)
--- a/src/Tizen.NUI/src/internal/ViewRegistry.cs
+++ b/src/Tizen.NUI/src/internal/ViewRegistry.cs
@@ -330,10 +330,10 @@ namespace Tizen.NUI
         public void Register(Func<CustomView> createFunction, System.Type viewType)
         {
             // add the mapping between the view name and it's create function
-            _constructorMap.Add(viewType.ToString(), createFunction);
+            _constructorMap.Add(viewType.Name, createFunction);
 
             // Call into DALi C++ to register the control with the type registry
-            TypeRegistration.RegisterControl(viewType.ToString(), _createCallback);
+            TypeRegistration.RegisterControl(viewType.Name, _createCallback);
 
             // Cycle through each property in the class
             foreach (System.Reflection.PropertyInfo propertyInfo in viewType.GetProperties())
@@ -361,14 +361,14 @@ namespace Tizen.NUI
                             ScriptableProperty scriptableProp = attr as ScriptableProperty;
 
                             // we get the start property index, based on the type and it's heirachy, e.g. DateView (70,000)-> Spin (60,000) -> View (50,000)
-                            int propertyIndex = _propertyRangeManager.GetPropertyIndex(viewType.ToString(), viewType, scriptableProp.type);
+                            int propertyIndex = _propertyRangeManager.GetPropertyIndex(viewType.Name, viewType, scriptableProp.type);
 
                             // get the enum for the property type... E.g. registering a string property returns Tizen.NUI.PropertyType.String
                             Tizen.NUI.PropertyType propertyType = GetDaliPropertyType(propertyInfo.PropertyType.Name);
 
                             // Example   RegisterProperty("spin","maxValue", 50001, FLOAT, set, get );
                             // Native call to register the property
-                            TypeRegistration.RegisterProperty(viewType.ToString(), propertyInfo.Name, propertyIndex, propertyType, _setPropertyCallback, _getPropertyCallback);
+                            TypeRegistration.RegisterProperty(viewType.Name, propertyInfo.Name, propertyIndex, propertyType, _setPropertyCallback, _getPropertyCallback);
                         }
                     }
                     // Console.WriteLine ("property name = " + propertyInfo.Name);

diff --git a/src/Tizen.NUI/src/public/CustomView/Spin.cs b/src/Tizen.NUI/src/public/CustomView/Spin.cs
index 79ad32f..87ad1b1 100755 (executable)
--- a/src/Tizen.NUI/src/public/CustomView/Spin.cs
+++ b/src/Tizen.NUI/src/public/CustomView/Spin.cs
@@ -54,6 +54,8 @@ namespace Tizen.NUI
         // static constructor registers the control type (only runs once)
         static Spin()
         {
+            InternalSetting.DefaultParentOriginAsTopLeft = false;
+
             // ViewRegistry registers control type with DALi type registery
             // also uses introspection to find any properties that need to be registered with type registry
             ViewRegistry.Instance.Register(CreateInstance, typeof(Spin));
@@ -61,7 +63,6 @@ namespace Tizen.NUI
 
         public Spin() : base(typeof(Spin).Name, CustomViewBehaviour.RequiresKeyboardNavigationSupport)
         {
-
         }
 
         /// <summary>