From: dongsug.song Date: Wed, 21 Jun 2017 01:42:00 +0000 (+0900) Subject: Revert "[Tizen] some APIs are changed for preview#4" X-Git-Tag: accepted/tizen/unified/20170630.083250~18 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5191c0e041b9ee34eb8ba2a216e8579abd9c796f;p=platform%2Fcore%2Fcsapi%2Fnui.git Revert "[Tizen] some APIs are changed for preview#4" This reverts commit 33170eb7f9d0fc8169054d4ef02dbaa835183726. Change-Id: Idf5e65bf9b659443066b4e3ecfda301b4d2f02a2 --- diff --git a/Tizen.NUI/src/public/BaseComponents/View.cs b/Tizen.NUI/src/public/BaseComponents/View.cs index 3875e18..3e1ea1a 100755 --- a/Tizen.NUI/src/public/BaseComponents/View.cs +++ b/Tizen.NUI/src/public/BaseComponents/View.cs @@ -1772,7 +1772,7 @@ namespace Tizen.NUI.BaseComponents /// /// Readonly. /// - public Vector3 NaturalSize + internal Vector3 NaturalSize { get { @@ -3589,7 +3589,7 @@ namespace Tizen.NUI.BaseComponents } } - public event EventHandlerWithReturnType WheelMoved + public event EventHandlerWithReturnType WheelRolled { add { diff --git a/Tizen.NUI/src/public/UIComponents/ProgressBar.cs b/Tizen.NUI/src/public/ProgressBar.cs similarity index 100% rename from Tizen.NUI/src/public/UIComponents/ProgressBar.cs rename to Tizen.NUI/src/public/ProgressBar.cs diff --git a/Tizen.NUI/src/public/Property.cs b/Tizen.NUI/src/public/Property.cs index 9abbc3e..7f61663 100755 --- a/Tizen.NUI/src/public/Property.cs +++ b/Tizen.NUI/src/public/Property.cs @@ -904,18 +904,6 @@ namespace Tizen.NUI } /// - /// Retrieves the key at the specified position. - /// - /// The specified position - /// A reference to the key at the specified position - public string GetKey(uint position) - { - string ret = NDalicPINVOKE.Property_Map_GetKey(swigCPtr, position); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - /// /// Retrieve the key at the specified position. /// /// The specified position @@ -932,20 +920,7 @@ namespace Tizen.NUI /// /// The key to find /// The value if it exists, an empty object otherwise - public PropertyValue Find(string key) - { - global::System.IntPtr cPtr = NDalicPINVOKE.Property_Map_Find__SWIG_0(swigCPtr, key); - PropertyValue ret = (cPtr == global::System.IntPtr.Zero) ? null : new PropertyValue(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - /// - /// Finds the value for the specified key if it exists. - /// - /// The key to find - /// The value if it exists, an empty object otherwise - public PropertyValue Find(int key) + internal PropertyValue Find(int key) { global::System.IntPtr cPtr = NDalicPINVOKE.Property_Map_Find__SWIG_2(swigCPtr, key); PropertyValue ret = (cPtr == global::System.IntPtr.Zero) ? null : new PropertyValue(cPtr, false); @@ -968,34 +943,6 @@ namespace Tizen.NUI } /// - /// Finds the value for the specified key if it exists and its type is type. - /// - /// The key to find - /// The type to check - /// The value if it exists, an empty value otherwise - public PropertyValue Find(string key, PropertyType type) - { - global::System.IntPtr cPtr = NDalicPINVOKE.Property_Map_Find__SWIG_4(swigCPtr, key, (int)type); - PropertyValue ret = (cPtr == global::System.IntPtr.Zero) ? null : new PropertyValue(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - /// - /// Finds the value for the specified key if it exists and its type is type. - /// - /// The key to find - /// The type to check - /// The value if it exists, an empty value otherwise - public PropertyValue Find(int key, PropertyType type) - { - global::System.IntPtr cPtr = NDalicPINVOKE.Property_Map_Find__SWIG_5(swigCPtr, key, (int)type); - PropertyValue ret = (cPtr == global::System.IntPtr.Zero) ? null : new PropertyValue(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - /// /// Clears the map. /// public void Clear() diff --git a/Tizen.NUI/src/public/UIComponents/PushButton.cs b/Tizen.NUI/src/public/UIComponents/PushButton.cs index db79869..c6ec224 100755 --- a/Tizen.NUI/src/public/UIComponents/PushButton.cs +++ b/Tizen.NUI/src/public/UIComponents/PushButton.cs @@ -56,7 +56,7 @@ namespace Tizen.NUI.UIComponents return; } - if (type == DisposeTypes.Explicit) + if(type == DisposeTypes.Explicit) { //Called by User //Release your own managed resources here. @@ -99,234 +99,18 @@ namespace Tizen.NUI.UIComponents } - internal PushButton(PushButton pushButton) : this(NDalicPINVOKE.new_PushButton__SWIG_1(PushButton.getCPtr(pushButton)), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal PushButton Assign(PushButton pushButton) - { - PushButton ret = new PushButton(NDalicPINVOKE.PushButton_Assign(swigCPtr, PushButton.getCPtr(pushButton)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - /// - /// Downcasts a handle to PushButton handle.
- /// If handle points to a PushButton, the downcast produces valid handle.
- /// If not the returned handle is left uninitialized.
- /// - /// Handle to an object - /// handle to a PushButton or an uninitialized handle - internal new static PushButton DownCast(BaseHandle handle) - { - PushButton ret = new PushButton(NDalicPINVOKE.PushButton_DownCast(BaseHandle.getCPtr(handle)), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal new void SetButtonImage(Image image) - { - NDalicPINVOKE.PushButton_SetButtonImage__SWIG_0_0(swigCPtr, Image.getCPtr(image)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal void SetButtonImage(View image) - { - NDalicPINVOKE.PushButton_SetButtonImage__SWIG_1(swigCPtr, View.getCPtr(image)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal void SetBackgroundImage(View image) - { - NDalicPINVOKE.PushButton_SetBackgroundImage(swigCPtr, View.getCPtr(image)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal new void SetSelectedImage(Image image) - { - NDalicPINVOKE.PushButton_SetSelectedImage__SWIG_0_0(swigCPtr, Image.getCPtr(image)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal void SetSelectedImage(View image) - { - NDalicPINVOKE.PushButton_SetSelectedImage__SWIG_1(swigCPtr, View.getCPtr(image)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal void SetSelectedBackgroundImage(View image) - { - NDalicPINVOKE.PushButton_SetSelectedBackgroundImage(swigCPtr, View.getCPtr(image)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal void SetDisabledBackgroundImage(View image) - { - NDalicPINVOKE.PushButton_SetDisabledBackgroundImage(swigCPtr, View.getCPtr(image)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal void SetDisabledImage(View image) - { - NDalicPINVOKE.PushButton_SetDisabledImage(swigCPtr, View.getCPtr(image)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal void SetDisabledSelectedImage(View image) - { - NDalicPINVOKE.PushButton_SetDisabledSelectedImage(swigCPtr, View.getCPtr(image)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal enum PropertyRange - { - PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX, - PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX + 1000 - } - - /// - /// Sets the unselected button image. - /// - public string UnselectedIcon - { - set - { - SetProperty(PushButton.Property.UNSELECTED_ICON, new Tizen.NUI.PropertyValue(value)); - } - } - /// - /// Sets the selected button image. - /// - public string SelectedIcon - { - set - { - SetProperty(PushButton.Property.SELECTED_ICON, new Tizen.NUI.PropertyValue(value)); - } - } - /// - /// Sets the icon alignment. - /// - public IconAlignmentType IconAlignment - { - get - { - string temp; - if (GetProperty(PushButton.Property.ICON_ALIGNMENT).Get(out temp) == false) - { -#if DEBUG_ON - Tizen.Log.Error("NUI", "IconAlignment get error!"); -#endif - } - switch (temp) - { - case "LEFT": - return IconAlignmentType.Left; - case "RIGHT": - return IconAlignmentType.Right; - case "TOP": - return IconAlignmentType.Top; - case "BOTTOM": - return IconAlignmentType.Bottom; - default: - return IconAlignmentType.Default; - } - } - set - { - string valueToString = ""; - switch (value) - { - case IconAlignmentType.Left: - { - valueToString = "LEFT"; - break; - } - case IconAlignmentType.Right: - { - valueToString = "RIGHT"; - break; - } - case IconAlignmentType.Top: - { - valueToString = "TOP"; - break; - } - case IconAlignmentType.Bottom: - { - valueToString = "BOTTOM"; - break; - } - default: - { - valueToString = "DEFAULT"; - break; - } - } - SetProperty(PushButton.Property.ICON_ALIGNMENT, new Tizen.NUI.PropertyValue(valueToString)); - } - } - /// - /// Sets the label padding value. - /// - public Vector4 LabelPadding - { - get - { - Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f); - GetProperty(PushButton.Property.LABEL_PADDING).Get(temp); - return temp; - } - set - { - SetProperty(PushButton.Property.LABEL_PADDING, new Tizen.NUI.PropertyValue(value)); - } - } - - /// - /// Sets the icon padding value. - /// - public Vector4 IconPadding - { - get - { - Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f); - GetProperty(PushButton.Property.ICON_PADDING).Get(temp); - return temp; - } - set - { - SetProperty(PushButton.Property.ICON_PADDING, new Tizen.NUI.PropertyValue(value)); - } - } - - /// - /// Enumeration for the alignment modes of the icon. - /// - public enum IconAlignmentType - { - /// - /// Icon located to the left of text. - /// - Left, - /// - /// Icon located to the right of text. - /// - Right, - /// - /// Icon located to the top of text. - /// - Top, - /// - /// Icon located to the bottom of text. - /// - Bottom, - /// - /// Icon located to the right of text by default. - /// - Default = Right - } - - } + /// + /// Downcasts a handle to PushButton handle.
+ /// If handle points to a PushButton, the downcast produces valid handle.
+ /// If not the returned handle is left uninitialized.
+ /// + /// Handle to an object + /// handle to a PushButton or an uninitialized handle + internal new static PushButton DownCast(BaseHandle handle) + { + PushButton ret = new PushButton(NDalicPINVOKE.PushButton_DownCast(BaseHandle.getCPtr(handle)), true); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } } diff --git a/Tizen.NUI/src/public/Window.cs b/Tizen.NUI/src/public/Window.cs index f9490ef..866720e 100755 --- a/Tizen.NUI/src/public/Window.cs +++ b/Tizen.NUI/src/public/Window.cs @@ -863,7 +863,7 @@ namespace Tizen.NUI /// then when the last finger is lifted.
/// An interrupted event will also be emitted (if it occurs).
/// - public event EventHandler Touch + public event EventHandler Touched { add { @@ -931,7 +931,7 @@ namespace Tizen.NUI /// /// Event emitted when wheel event is received. /// - public event EventHandler WheelRoll + public event EventHandler WheelRolled { add { @@ -996,7 +996,7 @@ namespace Tizen.NUI /// /// Event emitted when key event is received. /// - public event EventHandler Key + public event EventHandler KeyEvent { add {