[NUI] sync with dalihub (#746)

author huiyueun <35286162+huiyueun@users.noreply.github.com>

Wed, 13 Mar 2019 05:09:16 +0000 (14:09 +0900)

committer dongsug-song <35130733+dongsug-song@users.noreply.github.com>

Wed, 13 Mar 2019 05:09:16 +0000 (14:09 +0900)
author huiyueun <35286162+huiyueun@users.noreply.github.com>
Wed, 13 Mar 2019 05:09:16 +0000 (14:09 +0900)
committer dongsug-song <35130733+dongsug-song@users.noreply.github.com>
Wed, 13 Mar 2019 05:09:16 +0000 (14:09 +0900)
diff --git a/src/Tizen.NUI/src/internal/Application.cs b/src/Tizen.NUI/src/internal/Application.cs

index 90dc878..d1e618a 100755 (executable)
--- a/src/Tizen.NUI/src/internal/Application.cs
+++ b/src/Tizen.NUI/src/internal/Application.cs
@@ -1013,7 +1013,6 @@ namespace Tizen.NUI
              {
                  Window.Instance.DisconnectNativeSignals();
              }
-
          }
  
          /**
@@ -1332,12 +1331,12 @@ namespace Tizen.NUI
          {
              lock (this)
              {
-            NUIApplicationBatteryLowEventArgs e = new NUIApplicationBatteryLowEventArgs();
+                NUIApplicationBatteryLowEventArgs e = new NUIApplicationBatteryLowEventArgs();
  
-            // Populate all members of "e" (NUIApplicationBatteryLowEventArgs) with real data
-            e.BatteryStatus = status;
-            _applicationBatteryLowEventHandler?.Invoke(this, e);
-        }
+                // Populate all members of "e" (NUIApplicationBatteryLowEventArgs) with real data
+                e.BatteryStatus = status;
+                _applicationBatteryLowEventHandler?.Invoke(this, e);
+            }
          }
  
          /**
@@ -1380,12 +1379,12 @@ namespace Tizen.NUI
          {
              lock (this)
              {
-            NUIApplicationMemoryLowEventArgs e = new NUIApplicationMemoryLowEventArgs();
+                NUIApplicationMemoryLowEventArgs e = new NUIApplicationMemoryLowEventArgs();
  
-            // Populate all members of "e" (NUIApplicationMemoryLowEventArgs) with real data
-            e.MemoryStatus = status;
-            _applicationMemoryLowEventHandler?.Invoke(this, e);
-        }
+                // Populate all members of "e" (NUIApplicationMemoryLowEventArgs) with real data
+                e.MemoryStatus = status;
+                _applicationMemoryLowEventHandler?.Invoke(this, e);
+            }
          }
  
          /**
diff --git a/src/Tizen.NUI/src/internal/ApplicationExtensions.cs b/src/Tizen.NUI/src/internal/ApplicationExtensions.cs

deleted file mode 100755 (executable)

index 8f6f15d..0000000
--- a/src/Tizen.NUI/src/internal/ApplicationExtensions.cs
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Copyright(c) 2017 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-namespace Tizen.NUI
-{
-
-    internal class ApplicationExtensions : global::System.IDisposable
-    {
-        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-        protected bool swigCMemOwn;
-
-        internal ApplicationExtensions(global::System.IntPtr cPtr, bool cMemoryOwn)
-        {
-            swigCMemOwn = cMemoryOwn;
-            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-        }
-
-        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(ApplicationExtensions obj)
-        {
-            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-        }
-
-        //A Flag to check who called Dispose(). (By User or DisposeQueue)
-        private bool isDisposeQueued = false;
-        //A Flat to check if it is already disposed.
-        protected bool disposed = false;
-
-        ~ApplicationExtensions()
-        {
-            if (!isDisposeQueued)
-            {
-                isDisposeQueued = true;
-                DisposeQueue.Instance.Add(this);
-            }
-        }
-
-        public void Dispose()
-        {
-            //Throw excpetion if Dispose() is called in separate thread.
-            if (!Window.IsInstalled())
-            {
-                throw new System.InvalidOperationException("This API called from separate thread. This API must be called from MainThread.");
-            }
-
-            if (isDisposeQueued)
-            {
-                Dispose(DisposeTypes.Implicit);
-            }
-            else
-            {
-                Dispose(DisposeTypes.Explicit);
-                System.GC.SuppressFinalize(this);
-            }
-        }
-
-        protected virtual void Dispose(DisposeTypes type)
-        {
-            if (disposed)
-            {
-                return;
-            }
-
-            if (type == DisposeTypes.Explicit)
-            {
-                //Called by User
-                //Release your own managed resources here.
-                //You should release all of your own disposable objects here.
-
-            }
-
-            //Release your own unmanaged resources here.
-            //You should not access any managed member here except static instance.
-            //because the execution order of Finalizes is non-deterministic.
-
-            if (swigCPtr.Handle != global::System.IntPtr.Zero)
-            {
-                if (swigCMemOwn)
-                {
-                    swigCMemOwn = false;
-                    NDalicPINVOKE.delete_ApplicationExtensions(swigCPtr);
-                }
-                swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-            }
-
-            disposed = true;
-        }
-
-
-        public ApplicationExtensions() : this(NDalicPINVOKE.new_ApplicationExtensions__SWIG_0(), true)
-        {
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
-        public ApplicationExtensions(Application application) : this(NDalicPINVOKE.new_ApplicationExtensions__SWIG_1(Application.getCPtr(application)), true)
-        {
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
-        public void Init()
-        {
-            NDalicPINVOKE.ApplicationExtensions_Init(swigCPtr);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
-        public void Start()
-        {
-            NDalicPINVOKE.ApplicationExtensions_Start(swigCPtr);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
-        public void Terminate()
-        {
-            NDalicPINVOKE.ApplicationExtensions_Terminate(swigCPtr);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
-        public void Pause()
-        {
-            NDalicPINVOKE.ApplicationExtensions_Pause(swigCPtr);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
-        public void Resume()
-        {
-            NDalicPINVOKE.ApplicationExtensions_Resume(swigCPtr);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
-        public void LanguageChange()
-        {
-            NDalicPINVOKE.ApplicationExtensions_LanguageChange(swigCPtr);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
-    }
-
-}
diff --git a/src/Tizen.NUI/src/internal/EnvironmentVariable.cs b/src/Tizen.NUI/src/internal/EnvironmentVariable.cs

old mode 100644 (file)

new mode 100755 (executable)
diff --git a/src/Tizen.NUI/src/internal/Layouting/LayoutLengthEx.cs b/src/Tizen.NUI/src/internal/Layouting/LayoutLengthEx.cs

new file mode 100755 (executable)

index 0000000..cc5b4fa
--- /dev/null
+++ b/src/Tizen.NUI/src/internal/Layouting/LayoutLengthEx.cs
@@ -0,0 +1,219 @@
+/*
+ * Copyright (c) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+using System;
+using System.ComponentModel;
+using Tizen.NUI.BaseComponents;
+
+namespace Tizen.NUI
+{
+    /// <summary>
+    /// [Draft] A type that represents a layout length. Currently, this implies pixels, but could be extended to handle device dependant sizes, etc.
+    /// </summary>
+    internal class LayoutLengthEx : IEquatable<LayoutLengthEx>
+    {
+        private readonly float _value;
+
+        /// <summary>
+        /// [Draft] Constructor from an int
+        /// </summary>
+        /// <param name="value">Int to initialize with.</param>
+        public LayoutLengthEx(int value)
+        {
+            _value = value;
+        }
+
+        /// <summary>
+        /// [Draft] Constructor from a float
+        /// </summary>
+        /// <param name="value">Float to initialize with.</param>
+        public LayoutLengthEx(float value)
+        {
+            _value = value;
+        }
+
+        /// <summary>
+        /// [Draft] Constructor from a LayoutLength
+        /// </summary>
+        /// <param name="layoutLength">LayoutLength object to initialize with.</param>
+        public LayoutLengthEx(LayoutLengthEx layoutLength)
+        {
+            _value = layoutLength._value;
+        }
+
+        /// <summary>
+        /// [Draft] Return value as rounded value (whole number), best used as final output
+        /// </summary>
+        /// <returns>The layout length value as a rounded whole number.</returns>
+        public float AsRoundedValue()
+        {
+            return (float)Math.Round((decimal)_value, MidpointRounding.AwayFromZero);
+        }
+
+        /// <summary>
+        /// [Draft] Return value as the raw decimal value, best used for calculations
+        /// </summary>
+        /// <returns>The layout length value as the raw decimal value.</returns>
+        public float AsDecimal()
+        {
+            return _value;
+        }
+
+        /// <summary>
+        /// [Draft] The == operator.
+        /// </summary>
+        /// <param name="arg1">The first value.</param>
+        /// <param name="arg2">The second value</param>
+        /// <returns>true if LayoutLengths are equal</returns>
+        public static bool operator ==(LayoutLengthEx arg1, LayoutLengthEx arg2)
+        {
+            return arg1.Equals(arg2);
+        }
+
+        /// <summary>
+        /// [Draft] The != operator.
+        /// </summary>
+        /// <param name="arg1">The first value.</param>
+        /// <param name="arg2">The second value</param>
+        /// <returns>true if LayoutLengths are not equal</returns>
+        public static bool operator !=(LayoutLengthEx arg1, LayoutLengthEx arg2)
+        {
+            return !arg1.Equals(arg2);
+        }
+
+        /// <summary>
+        /// Determines whether the specified object is equal to the current object.
+        /// </summary>
+        /// <param name="obj">The object to compare with the current object.</param>
+        /// <returns>true if equal LayoutLength, else false.</returns>
+        public override bool Equals(object obj)
+        {
+            LayoutLengthEx layoutLengthEx = obj as LayoutLengthEx;
+            if (layoutLengthEx != null)
+            {
+                return Equals(layoutLengthEx);
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Determines whether the specified object is equal to the current object.
+        /// </summary>
+        /// <param name="layoutLength">The LayoutLength to compare with the current LayoutLength.</param>
+        /// <returns>true if equal LayoutLengths, else false.</returns>
+        public bool Equals(LayoutLengthEx layoutLength)
+        {
+            return (Math.Abs(_value - layoutLength._value ) <= float.Epsilon);
+        }
+
+        /// <summary>
+        /// A hash code for the current object.
+        /// </summary>
+        public override int GetHashCode()
+        {
+            return _value.GetHashCode();
+        }
+
+        /// <summary>
+        /// The addition operator.
+        /// </summary>
+        /// <param name="arg1">The first value.</param>
+        /// <param name="arg2">The second value.</param>
+        /// <returns>The LayoutLength containing the result of the addition.</returns>
+        public static LayoutLengthEx operator +(LayoutLengthEx arg1, LayoutLengthEx arg2)
+        {
+            return new LayoutLengthEx( arg1._value + arg2._value );
+        }
+
+        /// <summary>
+        /// The addition operator.
+        /// </summary>
+        /// <param name="arg1">The first value.</param>
+        /// <param name="arg2">The second value.</param>
+        /// <returns>The LayoutLength containing the result of the addition.</returns>
+        public static LayoutLengthEx operator +(LayoutLengthEx arg1, int arg2)
+        {
+            return new LayoutLengthEx(arg1._value + (float)arg2);
+        }
+
+        /// <summary>
+        /// The subtraction operator.
+        /// </summary>
+        /// <param name="arg1">The first value.</param>
+        /// <param name="arg2">The second value.</param>
+        /// <returns>The LayoutLength containing the result of the subtraction.</returns>
+        public static LayoutLengthEx operator -(LayoutLengthEx arg1, LayoutLengthEx arg2)
+        {
+            return new LayoutLengthEx(arg1._value - arg2._value);
+        }
+
+        /// <summary>
+        /// The subtraction operator.
+        /// </summary>
+        /// <param name="arg1">The first value.</param>
+        /// <param name="arg2">The second value.</param>
+        /// <returns>The LayoutLength containing the result of the subtraction.</returns>
+        public static LayoutLengthEx operator -(LayoutLengthEx arg1, int arg2)
+        {
+            return new LayoutLengthEx(arg1._value - (float)arg2);
+        }
+
+        /// <summary>
+        /// The multiplication operator.
+        /// </summary>
+        /// <param name="arg1">The first value.</param>
+        /// <param name="arg2">The second value.</param>
+        /// <returns>The LayoutLength containing the result of the multiplication.</returns>
+        public static LayoutLengthEx operator *(LayoutLengthEx arg1, LayoutLengthEx arg2)
+        {
+            return new LayoutLengthEx(arg1._value * arg2._value);
+        }
+
+        /// <summary>
+        /// Th multiplication operator.
+        /// </summary>
+        /// <param name="arg1">The first value.</param>
+        /// <param name="arg2">The int value to scale the LayoutLength.</param>
+        /// <returns>The LayoutLength containing the result of the scaling.</returns>
+        public static LayoutLengthEx operator *(LayoutLengthEx arg1, int arg2)
+        {
+            return new LayoutLengthEx(arg1._value * arg2);
+        }
+
+        /// <summary>
+        /// The division operator.
+        /// </summary>
+        /// <param name="arg1">The first value.</param>
+        /// <param name="arg2">The second value.</param>
+        /// <returns>The LayoutLength containing the result of the division.</returns>
+        public static LayoutLengthEx operator /(LayoutLengthEx arg1, LayoutLengthEx arg2)
+        {
+            return new LayoutLengthEx(arg1._value /  arg2._value);
+        }
+
+        /// <summary>
+        /// Th division operator.
+        /// </summary>
+        /// <param name="arg1">The first value.</param>
+        /// <param name="arg2">The int value to scale the vector by.</param>
+        /// <returns>The LayoutLength containing the result of the scaling.</returns>
+        public static LayoutLengthEx operator /(LayoutLengthEx arg1, int arg2)
+        {
+            return new LayoutLengthEx(arg1._value / (float)arg2);
+        }
+    }
+}
diff --git a/src/Tizen.NUI/src/internal/Layouting/LayoutSizeEx.cs b/src/Tizen.NUI/src/internal/Layouting/LayoutSizeEx.cs

new file mode 100755 (executable)

index 0000000..c64bfc2
--- /dev/null
+++ b/src/Tizen.NUI/src/internal/Layouting/LayoutSizeEx.cs
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+        
+using System;
+using System.ComponentModel;
+using Tizen.NUI.BaseComponents;
+
+namespace Tizen.NUI
+{
+    /// <summary>
+    /// [Draft] This class represents a layout size (width and height), non mutable.
+    /// </summary>
+    internal class LayoutSizeEx : IEquatable<LayoutSizeEx>
+    {
+        /// <summary>
+        /// [Draft] Constructor from width and height
+        /// </summary>
+        /// <param name="width">Int to initialize with.</param>
+        /// <param name="height">Int to initialize with.</param>
+        public LayoutSizeEx(int width, int height)
+        {
+            Width = width;
+            Height = height;
+        }
+
+        /// <summary>
+        /// Computes a hash code for this LayoutSize for use in hash based collections.
+        /// </summary>
+        /// <returns>A non unique hash code .</returns>
+        public override int GetHashCode()
+        {
+            return Width ^ Height;
+        }
+
+        /// <summary>
+        /// Determines whether the specified object is equal to the current object.
+        /// </summary>
+        /// <param name="obj">The object to compare with the current object.</param>
+        /// <returns>true if equal LayoutSize, else false.</returns>
+        public override bool Equals(object obj)
+        {
+            LayoutSizeEx layoutSizeEx = (LayoutSizeEx)obj;
+            if (layoutSizeEx != null)
+            {
+                return this.Equals(layoutSizeEx);
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Whether the values of two LayoutSize objects are equals
+        /// </summary>
+        /// <param name="obj">Object to be compared against.</param>
+        /// <returns>true if obj is equal to this LayoutSize.</returns>
+        public bool Equals(LayoutSizeEx obj)
+        {
+            LayoutSizeEx layoutSize = obj;
+            return ((layoutSize.Width == Width) && (layoutSize.Height == Height));
+        }
+
+        /// <summary>
+        /// [Draft] Get the width value of this layout
+        /// </summary>
+        public int Width{ get; private set; }
+
+        /// <summary>
+        /// [Draft] Get the height value of this layout
+        /// </summary>
+        public int Height{ get; private set; }
+
+    }
+}
diff --git a/src/Tizen.NUI/src/internal/Layouting/MeasureSpecification.cs b/src/Tizen.NUI/src/internal/Layouting/MeasureSpecification.cs

new file mode 100755 (executable)

index 0000000..064ac5a
--- /dev/null
+++ b/src/Tizen.NUI/src/internal/Layouting/MeasureSpecification.cs
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+using System.ComponentModel;
+using Tizen.NUI.BaseComponents;
+
+namespace Tizen.NUI
+{
+    /// <summary>
+    /// [Draft] A MeasureSpecification is used during the Measure pass by a LayoutGroup to inform it's children how to be measured.
+    /// For instance, it may measure a child with an exact width and an unspecified height in order to determine height for width.
+    /// </summary>
+    internal class MeasureSpecification
+    {
+        /// <summary>
+        /// MeasureSpecification Size value.
+        /// </summary>
+        public LayoutLengthEx Size;
+
+        /// <summary>
+        /// MeasureSpecification Mode.
+        /// </summary>
+        public MeasureSpecification.ModeType Mode;
+
+        /// <summary>
+        /// Constructor taking size and mode type.
+        /// </summary>
+        /// <param name="size">size value.</param>
+        /// <param name="mode">mode vaue.</param>
+        public MeasureSpecification(LayoutLengthEx size, MeasureSpecification.ModeType mode)
+        {
+            Size = size;
+            Mode = mode;
+        }
+
+        public enum ModeType
+        {
+            /// <summary>
+            /// This is used by a parent to determine the desired dimension of a child layout.
+            /// </summary>
+            Unspecified,
+            /// <summary>
+            /// This is used by a parent to impose an exact size on the child.
+            /// The child must use this size, and guarantee that all of its descendants will fit within this size.
+            /// </summary>
+            Exactly,
+            /// <summary>
+            /// This is used by the parent to impose a maximum size on the child.
+            /// The child must guarantee that it and all of it's descendants will fit within this size.
+            /// </summary>
+            AtMost
+        }
+    }
+}
diff --git a/src/Tizen.NUI/src/internal/Layouting/MeasuredSizeEx.cs b/src/Tizen.NUI/src/internal/Layouting/MeasuredSizeEx.cs

new file mode 100755 (executable)

index 0000000..5d806d5
--- /dev/null
+++ b/src/Tizen.NUI/src/internal/Layouting/MeasuredSizeEx.cs
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+using System.ComponentModel;
+using Tizen.NUI.BaseComponents;
+
+namespace Tizen.NUI
+{
+    /// <summary>
+    /// [Draft] Class that encodes a measurement and a measure state, which is set if the measured size is too small.
+    /// </summary>
+    internal class MeasuredSizeEx
+    {
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="measuredSize">size parameter</param>
+        /// <param name="state">State</param>
+        public MeasuredSizeEx(LayoutLengthEx measuredSize, MeasuredSizeEx.StateType state)
+        {
+            Size = measuredSize;
+            State = state;
+        }
+
+        /// <summary>
+        /// Creates a MeasuredSize from a LayoutLength
+        /// </summary>
+        /// <param name="measuredSize">LayoutLength to create </param>
+        public static implicit operator MeasuredSizeEx(LayoutLengthEx measuredSize)
+        {
+            return new MeasuredSizeEx(measuredSize, StateType.MeasuredSizeOK);
+        }
+
+        /// <summary>
+        /// LayoutLength size property
+        /// </summary>
+        public LayoutLengthEx Size{ get; set;}
+
+        /// <summary>
+        /// Measured state for this size.
+        /// </summary>
+        public StateType State{ get; set; }
+
+        /// <summary>
+        /// Measured states for a Size value.
+        /// </summary>
+        public enum StateType
+        {
+            /// <summary>
+            /// The measured size is good
+            /// </summary>
+            MeasuredSizeOK,
+            /// <summary>
+            /// The measured size is too small
+            /// </summary>
+            MeasuredSizeTooSmall
+        }
+    }
+}
diff --git a/src/Tizen.NUI/src/internal/NDalicPINVOKE.cs b/src/Tizen.NUI/src/internal/NDalicPINVOKE.cs

index 1b8b31a..36cb84d 100755 (executable)
--- a/src/Tizen.NUI/src/internal/NDalicPINVOKE.cs
+++ b/src/Tizen.NUI/src/internal/NDalicPINVOKE.cs
@@ -8126,43 +8126,6 @@ namespace Tizen.NUI
          [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_Dali_DragAndDropDetector_DroppedSignal")]
          public static extern global::System.IntPtr DragAndDropDetector_DroppedSignal(global::System.Runtime.InteropServices.HandleRef jarg1);
  
-
-        [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_Dali_new_ApplicationExtensions__SWIG_0")]
-        public static extern global::System.IntPtr new_ApplicationExtensions__SWIG_0();
-
-
-        [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_Dali_new_ApplicationExtensions__SWIG_1")]
-        public static extern global::System.IntPtr new_ApplicationExtensions__SWIG_1(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-
-        [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_Dali_delete_ApplicationExtensions")]
-        public static extern void delete_ApplicationExtensions(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-
-        [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_Dali_ApplicationExtensions_Init")]
-        public static extern void ApplicationExtensions_Init(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-
-        [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_Dali_ApplicationExtensions_Start")]
-        public static extern void ApplicationExtensions_Start(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-
-        [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_Dali_ApplicationExtensions_Terminate")]
-        public static extern void ApplicationExtensions_Terminate(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-
-        [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_Dali_ApplicationExtensions_Pause")]
-        public static extern void ApplicationExtensions_Pause(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-
-        [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_Dali_ApplicationExtensions_Resume")]
-        public static extern void ApplicationExtensions_Resume(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-
-        [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_Dali_ApplicationExtensions_LanguageChange")]
-        public static extern void ApplicationExtensions_LanguageChange(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-
          [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_Dali_Window_New__SWIG_0")]
          public static extern global::System.IntPtr Window_New__SWIG_0(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2, bool jarg3);
  
diff --git a/src/Tizen.NUI/src/internal/XamlBinding/ResourcesExtensions.cs b/src/Tizen.NUI/src/internal/XamlBinding/ResourcesExtensions.cs

index b4cd21a..a598985 100755 (executable)
--- a/src/Tizen.NUI/src/internal/XamlBinding/ResourcesExtensions.cs
+++ b/src/Tizen.NUI/src/internal/XamlBinding/ResourcesExtensions.cs
@@ -16,16 +16,16 @@ namespace Tizen.NUI.Binding
                      resources = resources ?? new Dictionary<string, object>();
                      if (ve.XamlResources != null)
                      {
-                    foreach (KeyValuePair<string, object> res in ve.XamlResources.MergedResources)
-                        if (!resources.ContainsKey(res.Key))
-                            resources.Add(res.Key, res.Value);
-                        else if (res.Key.StartsWith(Style.StyleClassPrefix, StringComparison.Ordinal))
-                        {
-                            var mergedClassStyles = new List<Style>(resources[res.Key] as List<Style>);
-                            mergedClassStyles.AddRange(res.Value as List<Style>);
-                            resources[res.Key] = mergedClassStyles;
-                        }
-                }
+                        foreach (KeyValuePair<string, object> res in ve.XamlResources.MergedResources)
+                            if (!resources.ContainsKey(res.Key))
+                                resources.Add(res.Key, res.Value);
+                            else if (res.Key.StartsWith(Style.StyleClassPrefix, StringComparison.Ordinal))
+                            {
+                                var mergedClassStyles = new List<Style>(resources[res.Key] as List<Style>);
+                                mergedClassStyles.AddRange(res.Value as List<Style>);
+                                resources[res.Key] = mergedClassStyles;
+                            }
+                    }
                  }
                  var app = element as Application;
                  if (app != null && app.SystemResources != null)
diff --git a/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs b/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs

index 2e54697..370cb5e 100755 (executable)
--- a/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs
@@ -49,7 +49,10 @@ namespace Tizen.NUI.BaseComponents
          defaultValueCreator: (bindable) =>
          {
              var imageView = (ImageView)bindable;
-            Tizen.NUI.Object.GetProperty(imageView.swigCPtr, ImageView.Property.IMAGE).Get(out imageView._url);
+            if(imageView._imageType == ImageType.Normal)
+            {
+                Tizen.NUI.Object.GetProperty(imageView.swigCPtr, ImageView.Property.IMAGE).Get(out imageView._url);
+            }
              return imageView._url;
          });
  
@@ -235,6 +238,7 @@ namespace Tizen.NUI.BaseComponents
          private string _url;
          private bool? _orientationCorrection;
          private PropertyMap _image;
+        private ImageType _imageType;
  
          /// <summary>
          /// Creates an initialized ImageView.
@@ -715,7 +719,7 @@ namespace Tizen.NUI.BaseComponents
  
          private void UpdateImage()
          {
-            if (_url != null)
+            if (_url != null && _url != "")
              {
                  if (_border != null)
                  { // for nine-patch image
@@ -727,6 +731,7 @@ namespace Tizen.NUI.BaseComponents
                      if (_synchronousLoading != null) { _nPatchMap.Add(NpatchImageVisualProperty.SynchronousLoading, new PropertyValue((bool)_synchronousLoading)); }
                      if (_orientationCorrection != null) { _nPatchMap.Add(ImageVisualProperty.OrientationCorrection, new PropertyValue((bool)_orientationCorrection)); }
                      SetProperty(ImageView.Property.IMAGE, new PropertyValue(_nPatchMap));
+                    _imageType = ImageType.Npatch;
                  }
                  else if (_synchronousLoading != null || _orientationCorrection != null)
                  { // for normal image, with synchronous loading property
@@ -736,10 +741,13 @@ namespace Tizen.NUI.BaseComponents
                      if (_synchronousLoading != null) { imageMap.Add(ImageVisualProperty.SynchronousLoading, new PropertyValue((bool)_synchronousLoading)); }
                      if (_orientationCorrection != null) { imageMap.Add(ImageVisualProperty.OrientationCorrection, new PropertyValue((bool)_orientationCorrection)); }
                      SetProperty(ImageView.Property.IMAGE, new PropertyValue(imageMap));
+
+                    _imageType = ImageType.Specific;
                  }
                  else
                  { // just for normal image
                      SetProperty(ImageView.Property.IMAGE, new PropertyValue(_url));
+                    _imageType = ImageType.Normal;
                  }
              }
              else
@@ -760,6 +768,7 @@ namespace Tizen.NUI.BaseComponents
                      map.Merge(_image);
                  }
                  SetProperty(ImageView.Property.IMAGE, new PropertyValue(map));
+                _imageType = ImageType.Normal;
              }
          }
  
@@ -826,5 +835,23 @@ namespace Tizen.NUI.BaseComponents
              internal static readonly int ACTION_PAUSE = NDalicManualPINVOKE.ImageView_IMAGE_VISUAL_ACTION_PAUSE_get();
              internal static readonly int ACTION_STOP = NDalicManualPINVOKE.ImageView_IMAGE_VISUAL_ACTION_STOP_get();
          }
+
+        private enum ImageType
+        {
+            /// <summary>
+            /// For Normal Image.
+            /// </summary>
+            Normal = 0,
+
+            /// <summary>
+            /// For normal image, with synchronous loading and orientation correction property
+            /// </summary>
+            Specific = 1,
+
+            /// <summary>
+            /// For nine-patch image
+            /// </summary>
+            Npatch = 2,
+        }
      }
  }
diff --git a/src/Tizen.NUI/src/public/BaseComponents/VisualView.cs b/src/Tizen.NUI/src/public/BaseComponents/VisualView.cs

index e27587a..441fecd 100755 (executable)
--- a/src/Tizen.NUI/src/public/BaseComponents/VisualView.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/VisualView.cs
@@ -50,7 +50,7 @@ namespace Tizen.NUI.BaseComponents
          /// Constructor.
          /// </summary>
          /// <since_tizen> 3 </since_tizen>
-        public VisualView() : base(typeof(VisualView).FullName, CustomViewBehaviour.ViewBehaviourDefault)
+        public VisualView() : base(typeof(VisualView).FullName, CustomViewBehaviour.ViewBehaviourDefault | CustomViewBehaviour.RequiresTouchEventsSupport)
          {
          }
  
diff --git a/src/Tizen.NUI/src/public/Color.cs b/src/Tizen.NUI/src/public/Color.cs

index 0bb24ea..13f59f6 100755 (executable)
--- a/src/Tizen.NUI/src/public/Color.cs
+++ b/src/Tizen.NUI/src/public/Color.cs
@@ -17,6 +17,7 @@
  
  using System;
  using Tizen.NUI.Binding;
+using System.ComponentModel;
  
  namespace Tizen.NUI
  {
@@ -24,7 +25,7 @@ namespace Tizen.NUI
      /// <summary>
      /// The Color class.
      /// </summary>
-    [TypeConverter(typeof(ColorTypeConverter))]
+    [Tizen.NUI.Binding.TypeConverter(typeof(ColorTypeConverter))]
      public class Color : global::System.IDisposable
      {
  
@@ -98,6 +99,8 @@ namespace Tizen.NUI
          //A Flag to check who called Dispose(). (By User or DisposeQueue)
          private bool isDisposeQueued = false;
  
+        private readonly bool hashDummy;
+
          /// <summary>
          /// Default constructor
          /// </summary>
@@ -135,6 +138,7 @@ namespace Tizen.NUI
          {
              swigCMemOwn = cMemoryOwn;
              swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+                       hashDummy = false;
          }
  
          /// <summary>
@@ -617,6 +621,55 @@ namespace Tizen.NUI
              return ret;
          }
  
+        private static bool EqualsColorValue(float f1, float f2)
+        {
+            float EPS = (float)Math.Abs(f1 * .00001);
+            if(Math.Abs(f1 - f2) <= EPS)
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        private static bool EqualsColor(Color c1, Color c2)
+        {
+            return EqualsColorValue(c1.R, c2.R) && EqualsColorValue(c1.G, c2.G)
+                && EqualsColorValue(c1.B, c2.B) && EqualsColorValue(c1.A, c2.A);
+        }
+
+        /// <summary>
+        /// Determines whether the specified object is equal to the current object.
+        /// </summary>
+        /// <param name="obj">The object to compare with the current object.</param>
+        /// <returns>true if the specified object is equal to the current object; otherwise, false.</returns>
+        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(System.Object obj)
+        {
+            Color color = obj as Color;
+            bool equal = false;
+            if (color == null)
+            {
+                return equal;
+            }
+
+            if (EqualsColor(this, color))
+            {
+                equal = true;
+            }
+            return equal;
+        }
+
+        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode()
+        {
+            return hashDummy.GetHashCode();
+        }
+
          private float ValueOfIndex(uint index)
          {
              float ret = NDalicPINVOKE.Vector4_ValueOfIndex__SWIG_0(swigCPtr, index);
diff --git a/src/Tizen.NUI/src/public/ImfManager.cs b/src/Tizen.NUI/src/public/ImfManager.cs

index 621fa18..a2dcd77 100755 (executable)
--- a/src/Tizen.NUI/src/public/ImfManager.cs
+++ b/src/Tizen.NUI/src/public/ImfManager.cs
@@ -705,11 +705,11 @@ namespace Tizen.NUI
          }
  
          /// <summary>
-        /// Dispose.
+        /// You can override it to clean-up your own resources.
          /// </summary>
          /// <param name="type">Dispose Type</param>
          /// <since_tizen> 3 </since_tizen>
-        /// Please DO NOT use! This will be deprecated!
+        /// Please do not use! This will be deprecated!
          /// Dispose() method in Singletone classes (ex: FocusManager, StyleManager, VisualFactory, ImfManager, TtsPlayer, Window) is not required.
          [EditorBrowsable(EditorBrowsableState.Never)]
          protected override void Dispose(DisposeTypes type)
@@ -728,7 +728,7 @@ namespace Tizen.NUI
              }
  
              //Release your own unmanaged resources here.
-            //You should not access any managed member here except static instance.
+            //You should not access any managed member here except static instance
              //because the execution order of Finalizes is non-deterministic.
  
              if (_keyboardTypeChangedEventCallback != null)
@@ -846,20 +846,20 @@ namespace Tizen.NUI
          public class ImfEventData : global::System.IDisposable
          {
              /// <summary>
-            /// swigCMemOwn
+            /// The state if it owns memory
              /// </summary>
              /// <since_tizen> 3 </since_tizen>
              protected bool swigCMemOwn;
  
              /// <summary>
-            /// A Flat to check if it is already disposed.
+            /// A flag to check if it is already disposed.
              /// </summary>
              /// <since_tizen> 3 </since_tizen>
              protected bool disposed = false;
  
              private global::System.Runtime.InteropServices.HandleRef swigCPtr;
  
-            //A Flag to check who called Dispose(). (By User or DisposeQueue)
+            //A flag to check who called Dispose(). (By User or DisposeQueue)
              private bool isDisposeQueued = false;
  
              /// <summary>
@@ -891,7 +891,7 @@ namespace Tizen.NUI
              }
  
              /// <summary>
-            /// Dispose.
+            /// Releases the resource.
              /// </summary>
              /// <since_tizen> 3 </since_tizen>
              ~ImfEventData()
@@ -1015,7 +1015,7 @@ namespace Tizen.NUI
              }
  
              /// <summary>
-            /// Dispose.
+            /// You can override it to clean-up your own resources.
              /// </summary>
              /// <since_tizen> 3 </since_tizen>
              protected virtual void Dispose(DisposeTypes type)
@@ -1058,20 +1058,20 @@ namespace Tizen.NUI
          public class ImfCallbackData : global::System.IDisposable
          {
              /// <summary>
-            /// swigCMemOwn
+            /// The state if it owns memory
              /// </summary>
              /// <since_tizen> 3 </since_tizen>
              protected bool swigCMemOwn;
  
              /// <summary>
-            /// A Flat to check if it is already disposed.
+            /// A flag to check if it is already disposed.
              /// </summary>
              /// <since_tizen> 3 </since_tizen>
              protected bool disposed = false;
  
              private global::System.Runtime.InteropServices.HandleRef swigCPtr;
  
-            //A Flag to check who called Dispose(). (By User or DisposeQueue)
+            //A flag to check who called Dispose(). (By User or DisposeQueue)
              private bool isDisposeQueued = false;
  
              /// <summary>
@@ -1103,7 +1103,7 @@ namespace Tizen.NUI
              }
  
              /// <summary>
-            /// Dispose.
+            /// Releases the resource.
              /// </summary>
              /// <since_tizen> 3 </since_tizen>
              ~ImfCallbackData()
@@ -1232,7 +1232,7 @@ namespace Tizen.NUI
              }
  
              /// <summary>
-            /// Dispose.
+            /// You can override it to clean-up your own resources.
              /// </summary>
              /// <since_tizen> 3 </since_tizen>
              protected virtual void Dispose(DisposeTypes type)
@@ -1275,7 +1275,7 @@ namespace Tizen.NUI
          public class ActivatedEventArgs : EventArgs
          {
              /// <summary>
-            /// ImfManager
+            /// The instance of ImfManager
              /// </summary>
              /// <since_tizen> 4 </since_tizen>
              public ImfManager ImfManager
@@ -1292,7 +1292,7 @@ namespace Tizen.NUI
          public class EventReceivedEventArgs : EventArgs
          {
              /// <summary>
-            /// ImfManager
+            /// The instance of ImfManager
              /// </summary>
              /// <since_tizen> 4 </since_tizen>
              public ImfManager ImfManager
@@ -1302,7 +1302,7 @@ namespace Tizen.NUI
              }
  
              /// <summary>
-            /// ImfEventData
+            /// The event data of IMF
              /// </summary>
              /// <since_tizen> 4 </since_tizen>
              public ImfEventData ImfEventData
@@ -1336,7 +1336,7 @@ namespace Tizen.NUI
          public class ResizedEventArgs : EventArgs
          {
              /// <summary>
-            /// resized.
+            /// The state if the IMF resized.
              /// </summary>
              /// <since_tizen> 4 </since_tizen>
              public int Resized
diff --git a/src/Tizen.NUI/src/public/InputMethodContext.cs b/src/Tizen.NUI/src/public/InputMethodContext.cs

index 368231a..01e967d 100755 (executable)
--- a/src/Tizen.NUI/src/public/InputMethodContext.cs
+++ b/src/Tizen.NUI/src/public/InputMethodContext.cs
@@ -696,11 +696,11 @@ namespace Tizen.NUI
          }
  
          /// <summary>
-        /// Dispose
+        /// You can override it to clean-up your own resources.
          /// </summary>
          /// <param name="type">Dispose Type</param>
          /// <since_tizen> 5 </since_tizen>
-        /// Please DO NOT use! This will be deprecated!
+        /// Please do not use! This will be deprecated!
          /// Dispose() method in Singletone classes (ex: FocusManager, StyleManager, VisualFactory, InputMethodContext, TtsPlayer, Window) is not required.
          [EditorBrowsable(EditorBrowsableState.Never)]
          protected override void Dispose(DisposeTypes type)
@@ -719,8 +719,8 @@ namespace Tizen.NUI
              }
  
              //Release your own unmanaged resources here.
-            //You should not access any managed member here except static instance.
-            //Because the execution order of Finalizes is non-deterministic.
+            //You should not access any managed member here except static instance
+            //because the execution order of Finalizes is non-deterministic.
  
              if (_keyboardTypeChangedEventCallback != null)
              {
@@ -837,7 +837,7 @@ namespace Tizen.NUI
          public class EventData : global::System.IDisposable
          {
              /// <summary>
-            /// swigCMemOwn
+            /// The state if it owns memory
              /// </summary>
              /// <since_tizen> 5 </since_tizen>
              protected bool swigCMemOwn;
@@ -882,7 +882,7 @@ namespace Tizen.NUI
              }
  
              /// <summary>
-            /// Dispose.
+            /// Releases the resource.
              /// </summary>
              /// <since_tizen> 5 </since_tizen>
              ~EventData()
@@ -1006,7 +1006,7 @@ namespace Tizen.NUI
              }
  
              /// <summary>
-            /// Dispose.
+            /// You can override it to clean-up your own resources.
              /// </summary>
              /// <since_tizen> 5 </since_tizen>
              protected virtual void Dispose(DisposeTypes type)
@@ -1049,7 +1049,7 @@ namespace Tizen.NUI
          public class CallbackData : global::System.IDisposable
          {
              /// <summary>
-            /// swigCMemOwn
+            /// The state if it owns memory
              /// </summary>
              /// <since_tizen> 5 </since_tizen>
              protected bool swigCMemOwn;
@@ -1062,7 +1062,7 @@ namespace Tizen.NUI
  
              private global::System.Runtime.InteropServices.HandleRef swigCPtr;
  
-            //A Flag to check who called Dispose(). (By User or DisposeQueue)
+            //A flag to check who called Dispose(). (By User or DisposeQueue)
              private bool isDisposeQueued = false;
  
              /// <summary>
@@ -1088,7 +1088,7 @@ namespace Tizen.NUI
              }
  
              /// <summary>
-            /// Dispose.
+            /// Releases the resource.
              /// </summary>
              /// <since_tizen> 5 </since_tizen>
              ~CallbackData()
@@ -1139,7 +1139,7 @@ namespace Tizen.NUI
              }
  
              /// <summary>
-            /// If the cursor position needs to be updated.
+            /// The state if the cursor position needs to be updated.
              /// </summary>
              /// <since_tizen> 5 </since_tizen>
              public bool Update
@@ -1223,7 +1223,7 @@ namespace Tizen.NUI
              }
  
              /// <summary>
-            /// Dispose.
+            /// You can override it to clean-up your own resources.
              /// </summary>
              /// <since_tizen> 5 </since_tizen>
              protected virtual void Dispose(DisposeTypes type)
@@ -1266,7 +1266,7 @@ namespace Tizen.NUI
          public class ActivatedEventArgs : EventArgs
          {
              /// <summary>
-            /// InputMethodContext
+            /// The instance of InputMethodContext
              /// </summary>
              /// <since_tizen> 5 </since_tizen>
              public InputMethodContext InputMethodContext
@@ -1283,7 +1283,7 @@ namespace Tizen.NUI
          public class EventReceivedEventArgs : EventArgs
          {
              /// <summary>
-            /// InputMethodContext
+            /// The instance of InputMethodContext
              /// </summary>
              /// <since_tizen> 5 </since_tizen>
              public InputMethodContext InputMethodContext
@@ -1293,7 +1293,7 @@ namespace Tizen.NUI
              }
  
              /// <summary>
-            /// EventData.
+            /// The event data of IMF
              /// </summary>
              /// <since_tizen> 5 </since_tizen>
              public EventData EventData
@@ -1327,7 +1327,7 @@ namespace Tizen.NUI
          public class ResizedEventArgs : EventArgs
          {
              /// <summary>
-            /// resized.
+            /// The state if the IMF resized.
              /// </summary>
              /// <since_tizen> 5 </since_tizen>
              public int Resized
diff --git a/src/Tizen.NUI/src/public/NUIConstants.cs b/src/Tizen.NUI/src/public/NUIConstants.cs

index c3cd64d..05ea25c 100755 (executable)
--- a/src/Tizen.NUI/src/public/NUIConstants.cs
+++ b/src/Tizen.NUI/src/public/NUIConstants.cs
@@ -121,10 +121,6 @@ namespace Tizen.NUI
          /// <summary>
          /// Will be replaced by separate ClippingMode enum. Draw the actor and its children into the stencil buffer.
          /// </summary>
-        /// <remarks>
-        /// Deprecated.(API Level 6) Use ClippingModeType instead.
-        /// </remarks>
-        [Obsolete("Please do not use this DrawModeType.Stencil(Deprecated). Please use ClippingModeType instead.")]
          Stencil = 3
      }
  
@@ -257,6 +253,27 @@ namespace Tizen.NUI
          /// </summary>
          DisableSizeNegotiation = 1 << 0,
          /// <summary>
+        /// True if OnTouch() callback is required.
+        /// </summary>
+        /// <since_tizen> 6 </since_tizen>
+        /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API.
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        RequiresTouchEventsSupport = 1 << 1,
+        /// <summary>
+        /// True if OnHover() callback is required.
+        /// </summary>
+        /// <since_tizen> 6 </since_tizen>
+        /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API.
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        RequiresHoverEventsSupport = 1 << 2,
+        /// <summary>
+        /// True if OnWheel() callback is required.
+        /// </summary>
+        /// <since_tizen> 6 </since_tizen>
+        /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API.
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        RequiresWheelEventsSupport = 1 << 3,
+        /// <summary>
          /// Use to provide key navigation support.
          /// </summary>
          RequiresKeyboardNavigationSupport = 1 << 5,
diff --git a/src/Tizen.NUI/src/public/Window.cs b/src/Tizen.NUI/src/public/Window.cs

index ba929bf..8406045 100644 (file)
--- a/src/Tizen.NUI/src/public/Window.cs
+++ b/src/Tizen.NUI/src/public/Window.cs
@@ -1530,7 +1530,7 @@ namespace Tizen.NUI
          private bool OnStageWheel(IntPtr rootLayer, IntPtr wheelEvent)
          {
              if (wheelEvent == global::System.IntPtr.Zero)
-        {
+            {
                  NUILog.Error("wheelEvent should not be null!");
                  return true;
              }
author	huiyueun <35286162+huiyueun@users.noreply.github.com>
	Wed, 13 Mar 2019 05:09:16 +0000 (14:09 +0900)
committer	dongsug-song <35130733+dongsug-song@users.noreply.github.com>
	Wed, 13 Mar 2019 05:09:16 +0000 (14:09 +0900)
src/Tizen.NUI/src/internal/Application.cs		patch \| blob \| history
src/Tizen.NUI/src/internal/ApplicationExtensions.cs	[deleted file]	patch \| blob \| history
src/Tizen.NUI/src/internal/EnvironmentVariable.cs	[changed mode: 0644->0755]	patch \| blob \| history
src/Tizen.NUI/src/internal/Layouting/LayoutLengthEx.cs	[new file with mode: 0755]	patch \| blob
src/Tizen.NUI/src/internal/Layouting/LayoutSizeEx.cs	[new file with mode: 0755]	patch \| blob
src/Tizen.NUI/src/internal/Layouting/MeasureSpecification.cs	[new file with mode: 0755]	patch \| blob
src/Tizen.NUI/src/internal/Layouting/MeasuredSizeEx.cs	[new file with mode: 0755]	patch \| blob
src/Tizen.NUI/src/internal/NDalicPINVOKE.cs		patch \| blob \| history
src/Tizen.NUI/src/internal/XamlBinding/ResourcesExtensions.cs		patch \| blob \| history
src/Tizen.NUI/src/public/BaseComponents/ImageView.cs		patch \| blob \| history
src/Tizen.NUI/src/public/BaseComponents/VisualView.cs		patch \| blob \| history
src/Tizen.NUI/src/public/Color.cs		patch \| blob \| history
src/Tizen.NUI/src/public/ImfManager.cs		patch \| blob \| history
src/Tizen.NUI/src/public/InputMethodContext.cs		patch \| blob \| history
src/Tizen.NUI/src/public/NUIConstants.cs		patch \| blob \| history
src/Tizen.NUI/src/public/Window.cs		patch \| blob \| history