Merge remote-tracking branch 'origin/master' into tizen

diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.ActorProperty.cs b/src/Tizen.NUI/src/internal/Interop/Interop.ActorProperty.cs
index ec56de3..ca9b1a7 100755 (executable)
--- a/src/Tizen.NUI/src/internal/Interop/Interop.ActorProperty.cs
+++ b/src/Tizen.NUI/src/internal/Interop/Interop.ActorProperty.cs
@@ -185,9 +185,6 @@ namespace Tizen.NUI
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Actor_Property_CLIPPING_MODE_get")]
             public static extern int Actor_Property_CLIPPING_MODE_get();
 
-            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Actor_Property_CAPTURE_ALL_TOUCH_AFTER_START_get")]
-            public static extern int ActorPropertyCaptureAllTouchAfterStartGet();
-
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_new_Actor_Property")]
             public static extern global::System.IntPtr new_Actor_Property();
 

diff --git a/src/Tizen.NUI/src/public/BaseComponents/View.cs b/src/Tizen.NUI/src/public/BaseComponents/View.cs
index 6f08f7b..3f80c68 100755 (executable)
--- a/src/Tizen.NUI/src/public/BaseComponents/View.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/View.cs
@@ -2291,26 +2291,6 @@ namespace Tizen.NUI.BaseComponents
             }
         }
 
-         /// <summary>
-        /// Whether the actor grab all touches even if touch leaves its boundary.
-        /// </summary>
-        /// <returns>true, if it grab all touch after start</returns>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public bool GrabTouchAfterLeave
-        {
-            get
-            {
-                bool temp = false;
-                GetProperty(View.Property.CaptureAllTouchAfterStart).Get(out temp);
-                return temp;
-            }
-            set
-            {
-                SetProperty(View.Property.CaptureAllTouchAfterStart, new Tizen.NUI.PropertyValue(value));
-                NotifyPropertyChanged();
-            }
-        }
-
         /// <summary>
         /// Get Style, it is abstract function and must be override.
         /// </summary>

diff --git a/src/Tizen.NUI/src/public/BaseComponents/ViewEnum.cs b/src/Tizen.NUI/src/public/BaseComponents/ViewEnum.cs
index bdd95d9..5360849 100755 (executable)
--- a/src/Tizen.NUI/src/public/BaseComponents/ViewEnum.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/ViewEnum.cs
@@ -206,7 +206,6 @@ namespace Tizen.NUI.BaseComponents
             internal static readonly int MARGIN = Interop.ViewProperty.View_Property_MARGIN_get();
             internal static readonly int PADDING = Interop.ViewProperty.View_Property_PADDING_get();
             internal static readonly int SHADOW = Interop.ViewProperty.View_Property_SHADOW_get();
-            internal static readonly int CaptureAllTouchAfterStart = Interop.ActorProperty.ActorPropertyCaptureAllTouchAfterStartGet();
         }
     }
 }

diff --git a/src/Tizen.NUI/src/public/WindowEvent.cs b/src/Tizen.NUI/src/public/WindowEvent.cs
index 93fec0f..3189b37 100755 (executable)
--- a/src/Tizen.NUI/src/public/WindowEvent.cs
+++ b/src/Tizen.NUI/src/public/WindowEvent.cs
@@ -650,9 +650,14 @@ namespace Tizen.NUI
         private void OnResized(IntPtr windowSize)
         {
             ResizedEventArgs e = new ResizedEventArgs();
-            var val = new Uint16Pair(windowSize, false);
-            e.WindowSize = new Size2D(val.GetWidth(), val.GetHeight());
-            val.Dispose();
+            // var val = new Uint16Pair(windowSize, false);
+            // e.WindowSize = new Size2D(val.GetWidth(), val.GetHeight());
+            // val.Dispose();
+
+            // Workaround : windowSize should be valid pointer from dali, 
+            // but currenlty it is fixed and is not Uint16Pair class.
+            // will be fixed later.
+            e.WindowSize = this.WindowSize;
 
             if (_windowResizedEventHandler != null)
             {