[NUI] Nui release 1.2.82 (#45)

* [NUI] Added RefObjectPtr null check condition in Registry

copy from gerrit
 : https://review.tizen.org/gerrit/#/c/167442/1

Signed-off-by: huiyu,eun <huiyu.eun@samsung.com>
* [NUI] C# binding for VERTICAL_LINE_ALIGNMENT property

Signed-off-by: huiyu,eun <huiyu.eun@samsung.com>
* [NUI] NUI release 1.2.82

Signed-off-by: huiyu,eun <huiyu.eun@samsung.com>

diff --git a/packaging/version.txt b/packaging/version.txt
index 33d2c1d..ed39e9f 100755 (executable)
--- a/packaging/version.txt
+++ b/packaging/version.txt
@@ -7,7 +7,7 @@ NUGET_VERSION=4.0.1-preview1-99999
 INTERNAL_NUGET_VERSION=4.0.1.999
 
 # RPM Version Suffix
-RPM_VERSION_SUFFIX=nui81
+RPM_VERSION_SUFFIX=nui82
 
 # Native Dependencies
-DALI_VERSION=1.2.81
+DALI_VERSION=1.2.82

diff --git a/src/Tizen.NUI/src/internal/ManualPINVOKE.cs b/src/Tizen.NUI/src/internal/ManualPINVOKE.cs
index 6e87878..71945bd 100755 (executable)
--- a/src/Tizen.NUI/src/internal/ManualPINVOKE.cs
+++ b/src/Tizen.NUI/src/internal/ManualPINVOKE.cs
@@ -720,6 +720,9 @@ namespace Tizen.NUI
         [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_TextLabel_Property_TEXT_DIRECTION_get")]
         public static extern int TextLabel_Property_TEXT_DIRECTION_get();
 
+        [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_TextLabel_Property_VERTICAL_LINE_ALIGNMENT_get")]
+        public static extern int TextLabel_Property_VERTICAL_LINE_ALIGNMENT_get();
+
         [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_HIDDENINPUT_PROPERTY_MODE_get")]
         public static extern int HIDDENINPUT_PROPERTY_MODE_get();
 
@@ -1738,5 +1741,6 @@ namespace Tizen.NUI
 
         [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_ImageView_IMAGE_VISUAL_ACTION_STOP_get")]
         public static extern int ImageView_IMAGE_VISUAL_ACTION_STOP_get();
+
     }
 }

diff --git a/src/Tizen.NUI/src/internal/Registry.cs b/src/Tizen.NUI/src/internal/Registry.cs
index 014d2ff..fc254b8 100755 (executable)
--- a/src/Tizen.NUI/src/internal/Registry.cs
+++ b/src/Tizen.NUI/src/internal/Registry.cs
@@ -1,5 +1,5 @@
 /*
- * Copyright(c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright(c) 2018 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -92,16 +92,32 @@ namespace Tizen.NUI
             RefObject refObj = baseHandle.GetObjectPtr();
             IntPtr refObjectPtr = (IntPtr)RefObject.getCPtr(refObj);
 
-            // we store a dictionary of ref-obects (C++ land) to managed obects (C# land)
-            return GetManagedBaseHandleFromRefObject(refObjectPtr);
+            if (refObjectPtr != null)
+            {
+                // we store a dictionary of ref-obects (C++ land) to managed obects (C# land)
+                return GetManagedBaseHandleFromRefObject(refObjectPtr);
+            }
+            else
+            {
+                NUILog.Error("NUI Registry RefObjectPtr is NULL!");
+                return null;
+            }
         }
 
         internal static BaseHandle GetManagedBaseHandleFromNativePtr(IntPtr cPtr)
         {
             IntPtr refObjectPtr = NDalicPINVOKE.GetRefObjectPtr(cPtr);
 
-            // we store a dictionary of ref-obects (C++ land) to managed obects (C# land)
-            return GetManagedBaseHandleFromRefObject(refObjectPtr);
+            if (refObjectPtr != null)
+            {
+                // we store a dictionary of ref-obects (C++ land) to managed obects (C# land)
+                return GetManagedBaseHandleFromRefObject(refObjectPtr);
+            }
+            else
+            {
+                NUILog.Error("NUI Registry RefObjectPtr is NULL!");
+                return null;
+            }
         }
 
         internal static BaseHandle GetManagedBaseHandleFromRefObject(IntPtr refObjectPtr)

diff --git a/src/Tizen.NUI/src/internal/VersionCheck.cs b/src/Tizen.NUI/src/internal/VersionCheck.cs
index 24d9cc6..fb51f00 100755 (executable)
--- a/src/Tizen.NUI/src/internal/VersionCheck.cs
+++ b/src/Tizen.NUI/src/internal/VersionCheck.cs
@@ -24,10 +24,10 @@ namespace Tizen.NUI
     {
         public const int daliVer1 = 1;
         public const int daliVer2 = 2;
-        public const int daliVer3 = 81;
+        public const int daliVer3 = 82;
         public const int nuiVer1 = 0;
         public const int nuiVer2 = 2;
-        public const int nuiVer3 = 81;
+        public const int nuiVer3 = 82;
         public const string nuiRelease = "";
 
 

diff --git a/src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs b/src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs
index 43d0a53..e832b2f 100755 (executable)
--- a/src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs
@@ -111,6 +111,7 @@ namespace Tizen.NUI.BaseComponents
             internal static readonly int LINE_COUNT = NDalicManualPINVOKE.TextLabel_Property_LINE_COUNT_get();
             internal static readonly int LINE_WRAP_MODE = NDalicManualPINVOKE.TextLabel_Property_LINE_WRAP_MODE_get();
             internal static readonly int TEXT_DIRECTION = NDalicManualPINVOKE.TextLabel_Property_TEXT_DIRECTION_get();
+            internal static readonly int VERTICAL_LINE_ALIGNMENT = NDalicManualPINVOKE.TextLabel_Property_VERTICAL_LINE_ALIGNMENT_get();
         }
 
         /// <summary>
@@ -833,5 +834,22 @@ namespace Tizen.NUI.BaseComponents
                 return (TextDirection)temp;
             }
         }
+
+        /// <summary>
+        /// The text vertical line alignment.
+        /// </summary>
+        /// <since_tizen> 5 </since_tizen>
+        /// This will be released at Tizen.NET API Level 5, so currently this would be used as inhouse API.
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public VerticalLineAlignment VerticalLineAlignment
+        {
+            get
+            {
+                int temp = 0;
+                GetProperty(TextLabel.Property.VERTICAL_LINE_ALIGNMENT).Get(out temp);
+                return (VerticalLineAlignment)temp;
+            }
+        }
+
     }
 }

diff --git a/src/Tizen.NUI/src/public/NUIConstants.cs b/src/Tizen.NUI/src/public/NUIConstants.cs
index 982861a..6a5fae0 100755 (executable)
--- a/src/Tizen.NUI/src/public/NUIConstants.cs
+++ b/src/Tizen.NUI/src/public/NUIConstants.cs
@@ -2452,6 +2452,39 @@ namespace Tizen.NUI
     }
 
     /// <summary>
+    /// An enum of vertical line alignment.
+    /// </summary>
+    /// <since_tizen> 5 </since_tizen>
+    /// This will be released at Tizen.NET API Level 5, so currently this would be used as inhouse API. 
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public enum VerticalLineAlignment
+    {    
+        /// <summary>
+        /// vertical line alignment is from top. 
+        /// </summary>
+        /// <since_tizen> 5 </since_tizen>
+        /// This will be released at Tizen.NET API Level 5, so currently this would be used as inhouse API. 
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        Top,
+
+        /// <summary>
+        /// vertical line alignment is from center.
+        /// </summary>
+        /// <since_tizen> 5 </since_tizen>
+        /// This will be released at Tizen.NET API Level 5, so currently this would be used as inhouse API. 
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        Center,
+
+        /// <summary>
+        /// vertical line alignment is from bottom.
+        /// </summary>
+        /// <since_tizen> 5 </since_tizen>
+        /// This will be released at Tizen.NET API Level 5, so currently this would be used as inhouse API. 
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        Bottom
+    }
+
+    /// <summary>
     /// Enumeration type for the font's slant.
     /// </summary>
     /// <since_tizen> 5 </since_tizen>