From 85836e48da52f1ca3c7e906e278429a612e4a2eb Mon Sep 17 00:00:00 2001 From: "dongsug.song" Date: Wed, 21 Jun 2017 10:42:20 +0900 Subject: [PATCH] Revert "[Tizen] changes for preview#4 release" This reverts commit fa323e8cc50c689477906219a769427d8e4de985. Change-Id: I92c6ac97fc9bc392638280331c6135638fb964ca --- src/Tizen.NUI/src/internal/Builder.cs | 2 +- src/Tizen.NUI/src/internal/Size.cs | 12 +- .../{public/UIComponents => internal}/Slider.cs | 2 +- src/Tizen.NUI/src/internal/VideoViewSignal.cs | 2 - src/Tizen.NUI/src/public/BaseComponents/View.cs | 119 +---------------- .../public/{BaseComponents => }/FlexContainer.cs | 4 +- src/Tizen.NUI/src/public/NUIConstants.cs | 147 --------------------- .../src/public/{BaseComponents => }/Scrollable.cs | 3 +- .../src/public/{BaseComponents => }/TableView.cs | 6 +- .../src/public/{BaseComponents => }/VideoView.cs | 3 +- src/Tizen.NUI/src/public/Window.cs | 16 +-- 11 files changed, 30 insertions(+), 286 deletions(-) rename src/Tizen.NUI/src/{public/UIComponents => internal}/Slider.cs (99%) rename src/Tizen.NUI/src/public/{BaseComponents => }/FlexContainer.cs (99%) rename src/Tizen.NUI/src/public/{BaseComponents => }/Scrollable.cs (99%) rename src/Tizen.NUI/src/public/{BaseComponents => }/TableView.cs (99%) rename src/Tizen.NUI/src/public/{BaseComponents => }/VideoView.cs (99%) diff --git a/src/Tizen.NUI/src/internal/Builder.cs b/src/Tizen.NUI/src/internal/Builder.cs index 6e5a521..0001b89 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; - public class Builder : BaseHandle + internal 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 83cd23b..c656b01 100755 --- a/src/Tizen.NUI/src/internal/Size.cs +++ b/src/Tizen.NUI/src/internal/Size.cs @@ -16,12 +16,12 @@ */ namespace Tizen.NUI -{ - - /*********************************************************************************/ - /*** will be removed/deprecated ***/ - /*********************************************************************************/ - public class Size : global::System.IDisposable +{ + + /// + /// Three dimensional size + /// + internal class Size : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/src/Tizen.NUI/src/public/UIComponents/Slider.cs b/src/Tizen.NUI/src/internal/Slider.cs similarity index 99% rename from src/Tizen.NUI/src/public/UIComponents/Slider.cs rename to src/Tizen.NUI/src/internal/Slider.cs index ff7b0fd..a6abd07 100755 --- a/src/Tizen.NUI/src/public/UIComponents/Slider.cs +++ b/src/Tizen.NUI/src/internal/Slider.cs @@ -34,7 +34,7 @@ namespace Tizen.NUI.UIComponents /// /// Slider is a control to enable sliding an indicator between two values. /// - public class Slider : View + internal class Slider : View { private global::System.Runtime.InteropServices.HandleRef swigCPtr; diff --git a/src/Tizen.NUI/src/internal/VideoViewSignal.cs b/src/Tizen.NUI/src/internal/VideoViewSignal.cs index 10ff327..18b79f8 100755 --- a/src/Tizen.NUI/src/internal/VideoViewSignal.cs +++ b/src/Tizen.NUI/src/internal/VideoViewSignal.cs @@ -8,8 +8,6 @@ // 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/BaseComponents/View.cs b/src/Tizen.NUI/src/public/BaseComponents/View.cs index 3e1ea1a..08deb3d 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 Touch + public event EventHandlerWithReturnType Touched { 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 Hover + public event EventHandlerWithReturnType Hovered { 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 WheelRoll + public event EventHandlerWithReturnType WheelRolled { add { @@ -3532,120 +3532,7 @@ 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/BaseComponents/FlexContainer.cs b/src/Tizen.NUI/src/public/FlexContainer.cs similarity index 99% rename from src/Tizen.NUI/src/public/BaseComponents/FlexContainer.cs rename to src/Tizen.NUI/src/public/FlexContainer.cs index 9dc26f7..0e598d6 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/FlexContainer.cs +++ b/src/Tizen.NUI/src/public/FlexContainer.cs @@ -24,7 +24,9 @@ // the SWIG interface file instead. //------------------------------------------------------------------------------ -namespace Tizen.NUI.BaseComponents +using Tizen.NUI.BaseComponents; + +namespace Tizen.NUI { /// /// 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/NUIConstants.cs b/src/Tizen.NUI/src/public/NUIConstants.cs index 4ce1930..8b25bcd 100755 --- a/src/Tizen.NUI/src/public/NUIConstants.cs +++ b/src/Tizen.NUI/src/public/NUIConstants.cs @@ -1364,152 +1364,5 @@ 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/public/BaseComponents/Scrollable.cs b/src/Tizen.NUI/src/public/Scrollable.cs similarity index 99% rename from src/Tizen.NUI/src/public/BaseComponents/Scrollable.cs rename to src/Tizen.NUI/src/public/Scrollable.cs index 4f747aa..f6edecc 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/Scrollable.cs +++ b/src/Tizen.NUI/src/public/Scrollable.cs @@ -8,11 +8,12 @@ // the SWIG interface file instead. //------------------------------------------------------------------------------ -namespace Tizen.NUI.BaseComponents +namespace Tizen.NUI { using System; using System.Runtime.InteropServices; + using Tizen.NUI.BaseComponents; public class Scrollable : View { diff --git a/src/Tizen.NUI/src/public/BaseComponents/TableView.cs b/src/Tizen.NUI/src/public/TableView.cs similarity index 99% rename from src/Tizen.NUI/src/public/BaseComponents/TableView.cs rename to src/Tizen.NUI/src/public/TableView.cs index 7d8c0c7..01a94ea 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/TableView.cs +++ b/src/Tizen.NUI/src/public/TableView.cs @@ -24,9 +24,11 @@ // the SWIG interface file instead. //------------------------------------------------------------------------------ -namespace Tizen.NUI.BaseComponents -{ +using Tizen.NUI.BaseComponents; +namespace Tizen.NUI +{ + 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/BaseComponents/VideoView.cs b/src/Tizen.NUI/src/public/VideoView.cs similarity index 99% rename from src/Tizen.NUI/src/public/BaseComponents/VideoView.cs rename to src/Tizen.NUI/src/public/VideoView.cs index 13e4b4b..af52689 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/VideoView.cs +++ b/src/Tizen.NUI/src/public/VideoView.cs @@ -24,11 +24,12 @@ // the SWIG interface file instead. //------------------------------------------------------------------------------ -namespace Tizen.NUI.BaseComponents +namespace Tizen.NUI { 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/Window.cs b/src/Tizen.NUI/src/public/Window.cs index 866720e..e2d05a7 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; } - /*********************************************************************************/ - /*** will be removed/deprecated ***/ - /*********************************************************************************/ - public void SetAcceptFocus(bool accept) + /// + /// Sets the focus acceptable flag of an window as true. + /// + internal void SetAcceptFocus(bool accept) { NDalicPINVOKE.SetAcceptFocus(swigCPtr, accept); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - /*********************************************************************************/ - /*** will be removed/deprecated ***/ - /*********************************************************************************/ - public bool IsFocusAcceptable() + /// + /// Retrieves whether the window is focus acceptable or not. + /// + internal bool IsFocusAcceptable() { return NDalicPINVOKE.IsFocusAcceptable(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); -- 2.7.4