From: dongsug.song Date: Tue, 13 Jun 2017 10:29:58 +0000 (+0900) Subject: [Tizen] changes for preview#4 release X-Git-Tag: preview1-00180^2~248 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=aa5ab55ecf7c130ae6dc453763a1182d671a5fec;p=platform%2Fcore%2Fcsapi%2Ftizenfx.git [Tizen] changes for preview#4 release Change-Id: I5206ad1726c7602c9df0f3a250c6d46bbe3a19ee Signed-off-by: dongsug.song --- diff --git a/src/Tizen.NUI/src/internal/Builder.cs b/src/Tizen.NUI/src/internal/Builder.cs index 0001b89..6e5a521 100755 --- a/src/Tizen.NUI/src/internal/Builder.cs +++ b/src/Tizen.NUI/src/internal/Builder.cs @@ -32,7 +32,7 @@ namespace Tizen.NUI using Tizen.NUI.BaseComponents; - internal class Builder : BaseHandle + public class Builder : BaseHandle { private global::System.Runtime.InteropServices.HandleRef swigCPtr; diff --git a/src/Tizen.NUI/src/internal/Size.cs b/src/Tizen.NUI/src/internal/Size.cs index c656b01..83cd23b 100755 --- a/src/Tizen.NUI/src/internal/Size.cs +++ b/src/Tizen.NUI/src/internal/Size.cs @@ -16,12 +16,12 @@ */ namespace Tizen.NUI -{ - - /// - /// Three dimensional size - /// - internal class Size : global::System.IDisposable +{ + + /*********************************************************************************/ + /*** will be removed/deprecated ***/ + /*********************************************************************************/ + public class Size : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/src/Tizen.NUI/src/internal/VideoViewSignal.cs b/src/Tizen.NUI/src/internal/VideoViewSignal.cs index 18b79f8..10ff327 100755 --- a/src/Tizen.NUI/src/internal/VideoViewSignal.cs +++ b/src/Tizen.NUI/src/internal/VideoViewSignal.cs @@ -8,6 +8,8 @@ // the SWIG interface file instead. //------------------------------------------------------------------------------ +using Tizen.NUI.BaseComponents; + namespace Tizen.NUI { internal class VideoViewSignal : global::System.IDisposable { diff --git a/src/Tizen.NUI/src/public/FlexContainer.cs b/src/Tizen.NUI/src/public/BaseComponents/FlexContainer.cs similarity index 99% rename from src/Tizen.NUI/src/public/FlexContainer.cs rename to src/Tizen.NUI/src/public/BaseComponents/FlexContainer.cs index 0e598d6..9dc26f7 100755 --- a/src/Tizen.NUI/src/public/FlexContainer.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/FlexContainer.cs @@ -24,9 +24,7 @@ // the SWIG interface file instead. //------------------------------------------------------------------------------ -using Tizen.NUI.BaseComponents; - -namespace Tizen.NUI +namespace Tizen.NUI.BaseComponents { /// /// FlexContainer implements a subset of the flexbox spec (defined by W3C):https://www.w3.org/TR/css3-flexbox/
diff --git a/src/Tizen.NUI/src/public/Scrollable.cs b/src/Tizen.NUI/src/public/BaseComponents/Scrollable.cs similarity index 99% rename from src/Tizen.NUI/src/public/Scrollable.cs rename to src/Tizen.NUI/src/public/BaseComponents/Scrollable.cs index f6edecc..4f747aa 100755 --- a/src/Tizen.NUI/src/public/Scrollable.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/Scrollable.cs @@ -8,12 +8,11 @@ // the SWIG interface file instead. //------------------------------------------------------------------------------ -namespace Tizen.NUI +namespace Tizen.NUI.BaseComponents { using System; using System.Runtime.InteropServices; - using Tizen.NUI.BaseComponents; public class Scrollable : View { diff --git a/src/Tizen.NUI/src/public/TableView.cs b/src/Tizen.NUI/src/public/BaseComponents/TableView.cs similarity index 99% rename from src/Tizen.NUI/src/public/TableView.cs rename to src/Tizen.NUI/src/public/BaseComponents/TableView.cs index 01a94ea..7d8c0c7 100755 --- a/src/Tizen.NUI/src/public/TableView.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/TableView.cs @@ -24,11 +24,9 @@ // the SWIG interface file instead. //------------------------------------------------------------------------------ -using Tizen.NUI.BaseComponents; - -namespace Tizen.NUI +namespace Tizen.NUI.BaseComponents { - using Tizen.NUI.BaseComponents; + /// /// TableView is a layout container for aligning child actors in a grid like layout.
/// TableView constrains the x and y position and width and height of the child actors.
diff --git a/src/Tizen.NUI/src/public/VideoView.cs b/src/Tizen.NUI/src/public/BaseComponents/VideoView.cs similarity index 99% rename from src/Tizen.NUI/src/public/VideoView.cs rename to src/Tizen.NUI/src/public/BaseComponents/VideoView.cs index af52689..13e4b4b 100755 --- a/src/Tizen.NUI/src/public/VideoView.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/VideoView.cs @@ -24,12 +24,11 @@ // the SWIG interface file instead. //------------------------------------------------------------------------------ -namespace Tizen.NUI +namespace Tizen.NUI.BaseComponents { using System; using System.Runtime.InteropServices; - using Tizen.NUI.BaseComponents; /// /// VideoView is a control for video playback and display. diff --git a/src/Tizen.NUI/src/public/BaseComponents/View.cs b/src/Tizen.NUI/src/public/BaseComponents/View.cs index 08deb3d..3e1ea1a 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/View.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/View.cs @@ -311,7 +311,7 @@ namespace Tizen.NUI.BaseComponents /// Event for Touched signal which can be used to subscribe/unsubscribe the event handler provided by the user.
/// Touched signal is emitted when touch input is received.
/// - public event EventHandlerWithReturnType Touched + public event EventHandlerWithReturnType Touch { add { @@ -383,7 +383,7 @@ namespace Tizen.NUI.BaseComponents /// Event for Hovered signal which can be used to subscribe/unsubscribe the event handler provided by the user.
/// Hovered signal is emitted when hover input is received.
/// - public event EventHandlerWithReturnType Hovered + public event EventHandlerWithReturnType Hover { add { @@ -455,7 +455,7 @@ namespace Tizen.NUI.BaseComponents /// Event for WheelMoved signal which can be used to subscribe/unsubscribe the event handler provided by the user.
/// WheelMoved signal is emitted when wheel event is received.
/// - public event EventHandlerWithReturnType WheelRolled + public event EventHandlerWithReturnType WheelRoll { add { @@ -3532,7 +3532,120 @@ namespace Tizen.NUI.BaseComponents { SetProperty(View.Property.CLIPPING_MODE, new Tizen.NUI.PropertyValue((int)value)); } + } + + + + + + /*********************************************************************************/ + /*** will be removed/deprecated ***/ + /*********************************************************************************/ + public event EventHandlerWithReturnType Touched + { + add + { + if (_touchDataEventHandler == null) + { + _touchDataCallback = OnTouch; + this.TouchSignal().Connect(_touchDataCallback); + } + + _touchDataEventHandler += value; + } + + remove + { + _touchDataEventHandler -= value; + + if (_touchDataEventHandler == null && TouchSignal().Empty() == false) + { + this.TouchSignal().Disconnect(_touchDataCallback); + } + + } + } + public event EventHandlerWithReturnType Hovered + { + add + { + if (_hoverEventHandler == null) + { + _hoverEventCallback = OnHoverEvent; + this.HoveredSignal().Connect(_hoverEventCallback); + } + + _hoverEventHandler += value; + } + + remove + { + _hoverEventHandler -= value; + + if (_hoverEventHandler == null && HoveredSignal().Empty() == false) + { + this.HoveredSignal().Disconnect(_hoverEventCallback); + } + + } } + public event EventHandlerWithReturnType WheelRolled + { + add + { + if (_wheelEventHandler == null) + { + _wheelEventCallback = OnWheelEvent; + this.WheelEventSignal().Connect(_wheelEventCallback); + } + + _wheelEventHandler += value; + } + + remove + { + _wheelEventHandler -= value; + + if (_wheelEventHandler == null && WheelEventSignal().Empty() == false) + { + this.WheelEventSignal().Disconnect(_wheelEventCallback); + } + + } + } + public Position AnchorPoint + { + get + { + Position temp = new Position(0.0f, 0.0f, 0.0f); + GetProperty(View.Property.ANCHOR_POINT).Get(temp); + return temp; + } + set + { + SetProperty(View.Property.ANCHOR_POINT, new Tizen.NUI.PropertyValue(value)); + } + } + + public Size Size + { + get + { + Size temp = new Size(0.0f, 0.0f, 0.0f); + GetProperty(View.Property.SIZE).Get(temp); + return temp; + } + set + { + SetProperty(View.Property.SIZE, new Tizen.NUI.PropertyValue(value)); + } + } + + + /*********************************************************************************/ + /*** will be removed/deprecated ***/ + /*********************************************************************************/ + } } diff --git a/src/Tizen.NUI/src/public/NUIConstants.cs b/src/Tizen.NUI/src/public/NUIConstants.cs index 8b25bcd..4ce1930 100755 --- a/src/Tizen.NUI/src/public/NUIConstants.cs +++ b/src/Tizen.NUI/src/public/NUIConstants.cs @@ -1364,5 +1364,152 @@ namespace Tizen.NUI { Explicit, //Called By User Implicit, //Called by DisposeQueue + } + + + + + //will be removed/deprecated + public struct AnchorPoint + { + public static float Top + { + get + { + float ret = NDalicPINVOKE.AnchorPointTop_get(); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + public static float Bottom + { + get + { + float ret = NDalicPINVOKE.AnchorPointBottom_get(); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + public static float Left + { + get + { + float ret = NDalicPINVOKE.AnchorPointLeft_get(); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + public static float Right + { + get + { + float ret = NDalicPINVOKE.AnchorPointRight_get(); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + public static float Middle + { + get + { + float ret = NDalicPINVOKE.AnchorPointMiddle_get(); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + public static Position TopLeft + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointTopLeft_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + public static Position TopCenter + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointTopCenter_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + public static Position TopRight + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointTopRight_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + public static Position CenterLeft + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointCenterLeft_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + public static Position Center + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointCenter_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + public static Position CenterRight + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointCenterRight_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + public static Position BottomLeft + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointBottomLeft_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + public static Position BottomCenter + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointBottomCenter_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + public static Position BottomRight + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointBottomRight_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } } + + + + } diff --git a/src/Tizen.NUI/src/internal/Slider.cs b/src/Tizen.NUI/src/public/UIComponents/Slider.cs similarity index 99% rename from src/Tizen.NUI/src/internal/Slider.cs rename to src/Tizen.NUI/src/public/UIComponents/Slider.cs index a6abd07..ff7b0fd 100755 --- a/src/Tizen.NUI/src/internal/Slider.cs +++ b/src/Tizen.NUI/src/public/UIComponents/Slider.cs @@ -34,7 +34,7 @@ namespace Tizen.NUI.UIComponents /// /// Slider is a control to enable sliding an indicator between two values. /// - internal class Slider : View + public class Slider : View { private global::System.Runtime.InteropServices.HandleRef swigCPtr; diff --git a/src/Tizen.NUI/src/public/Window.cs b/src/Tizen.NUI/src/public/Window.cs index e2d05a7..866720e 100755 --- a/src/Tizen.NUI/src/public/Window.cs +++ b/src/Tizen.NUI/src/public/Window.cs @@ -103,19 +103,19 @@ namespace Tizen.NUI return ret; } - /// - /// Sets the focus acceptable flag of an window as true. - /// - internal void SetAcceptFocus(bool accept) + /*********************************************************************************/ + /*** will be removed/deprecated ***/ + /*********************************************************************************/ + public void SetAcceptFocus(bool accept) { NDalicPINVOKE.SetAcceptFocus(swigCPtr, accept); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - /// - /// Retrieves whether the window is focus acceptable or not. - /// - internal bool IsFocusAcceptable() + /*********************************************************************************/ + /*** will be removed/deprecated ***/ + /*********************************************************************************/ + public bool IsFocusAcceptable() { return NDalicPINVOKE.IsFocusAcceptable(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();