[Tizen] to match previous version
authordongsug.song <dongsug.song@samsung.com>
Wed, 21 Jun 2017 07:32:35 +0000 (16:32 +0900)
committerdongsug.song <dongsug.song@samsung.com>
Wed, 21 Jun 2017 07:35:50 +0000 (16:35 +0900)
Change-Id: If3d66620d73db7b61cfc4ee94487561120ac2c3f
Signed-off-by: dongsug.song <dongsug.song@samsung.com>
16 files changed:
src/Tizen.NUI/src/internal/Application.cs
src/Tizen.NUI/src/public/BaseComponents/ImageView.cs
src/Tizen.NUI/src/public/BaseComponents/TableView.cs
src/Tizen.NUI/src/public/BaseComponents/TextEditor.cs
src/Tizen.NUI/src/public/BaseComponents/TextField.cs
src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs
src/Tizen.NUI/src/public/BaseComponents/VideoView.cs
src/Tizen.NUI/src/public/BaseComponents/View.cs
src/Tizen.NUI/src/public/FocusManager.cs
src/Tizen.NUI/src/public/KeyFrames.cs
src/Tizen.NUI/src/public/Layer.cs
src/Tizen.NUI/src/public/Path.cs
src/Tizen.NUI/src/public/Timer.cs
src/Tizen.NUI/src/public/UIComponents/PushButton.cs
src/Tizen.NUI/src/public/UIComponents/ScrollBar.cs
src/Tizen.NUI/src/public/Window.cs

index 1509e70..aac9d6a 100755 (executable)
@@ -55,7 +55,7 @@ namespace Tizen.NUI
       * @brief Event arguments that passed via NUIApplicationTerminate signal
       *
       */
-    internal class NUIApplicationTerminatingEventArgs : EventArgs
+    internal class NUIApplicationTerminateEventArgs : EventArgs
     {
         private Application _application;
         /**
@@ -79,7 +79,7 @@ namespace Tizen.NUI
       * @brief Event arguments that passed via NUIApplicationPause signal
       *
       */
-    internal class NUIApplicationPausedEventArgs : EventArgs
+    internal class NUIApplicationPauseEventArgs : EventArgs
     {
         private Application _application;
         /**
@@ -103,7 +103,7 @@ namespace Tizen.NUI
       * @brief Event arguments that passed via NUIApplicationResume signal
       *
       */
-    internal class NUIApplicationResumedEventArgs : EventArgs
+    internal class NUIApplicationResumeEventArgs : EventArgs
     {
         private Application _application;
         /**
@@ -151,7 +151,7 @@ namespace Tizen.NUI
       * @brief Event arguments that passed via NUIApplicationResize signal
       *
       */
-    internal class NUIApplicationResizedEventArgs : EventArgs
+    internal class NUIApplicationResizeEventArgs : EventArgs
     {
         private Application _application;
         /**
@@ -368,18 +368,18 @@ namespace Tizen.NUI
 
         [UnmanagedFunctionPointer(CallingConvention.StdCall)]
         private delegate void NUIApplicationTerminateEventCallbackDelegate(IntPtr application);
-        private DaliEventHandler<object, NUIApplicationTerminatingEventArgs> _applicationTerminateEventHandler;
+        private DaliEventHandler<object, NUIApplicationTerminateEventArgs> _applicationTerminateEventHandler;
         private NUIApplicationTerminateEventCallbackDelegate _applicationTerminateEventCallbackDelegate;
 
 
         [UnmanagedFunctionPointer(CallingConvention.StdCall)]
         private delegate void NUIApplicationPauseEventCallbackDelegate(IntPtr application);
-        private DaliEventHandler<object, NUIApplicationPausedEventArgs> _applicationPauseEventHandler;
+        private DaliEventHandler<object, NUIApplicationPauseEventArgs> _applicationPauseEventHandler;
         private NUIApplicationPauseEventCallbackDelegate _applicationPauseEventCallbackDelegate;
 
         [UnmanagedFunctionPointer(CallingConvention.StdCall)]
         private delegate void NUIApplicationResumeEventCallbackDelegate(IntPtr application);
-        private DaliEventHandler<object, NUIApplicationResumedEventArgs> _applicationResumeEventHandler;
+        private DaliEventHandler<object, NUIApplicationResumeEventArgs> _applicationResumeEventHandler;
         private NUIApplicationResumeEventCallbackDelegate _applicationResumeEventCallbackDelegate;
 
         [UnmanagedFunctionPointer(CallingConvention.StdCall)]
@@ -389,7 +389,7 @@ namespace Tizen.NUI
 
         [UnmanagedFunctionPointer(CallingConvention.StdCall)]
         private delegate void NUIApplicationResizeEventCallbackDelegate(IntPtr application);
-        private DaliEventHandler<object, NUIApplicationResizedEventArgs> _applicationResizeEventHandler;
+        private DaliEventHandler<object, NUIApplicationResizeEventArgs> _applicationResizeEventHandler;
         private NUIApplicationResizeEventCallbackDelegate _applicationResizeEventCallbackDelegate;
 
         [UnmanagedFunctionPointer(CallingConvention.StdCall)]
@@ -474,9 +474,9 @@ namespace Tizen.NUI
         /**
           * @brief Event for Terminated signal which can be used to subscribe/unsubscribe the event handler
           * (in the type of NUIApplicationTerminateEventHandler-DaliEventHandler<object,NUIApplicationTerminateEventArgs>)
-          *  provided by the user. Terminated signal is emitted when application is terminating
+          *  provided by the user. Terminated signal is emitted when application is terminated
           */
-        public event DaliEventHandler<object, NUIApplicationTerminatingEventArgs> Terminating
+        public event DaliEventHandler<object, NUIApplicationTerminateEventArgs> Terminated
         {
             add
             {
@@ -510,7 +510,7 @@ namespace Tizen.NUI
         // Callback for Application TerminateSignal
         private void OnNUIApplicationTerminate(IntPtr data)
         {
-            NUIApplicationTerminatingEventArgs e = new NUIApplicationTerminatingEventArgs();
+            NUIApplicationTerminateEventArgs e = new NUIApplicationTerminateEventArgs();
 
             // Populate all members of "e" (NUIApplicationTerminateEventArgs) with real data
             e.Application = Application.GetApplicationFromPtr(data);
@@ -527,7 +527,7 @@ namespace Tizen.NUI
           * (in the type of NUIApplicationPauseEventHandler-DaliEventHandler<object,NUIApplicationPauseEventArgs>)
           * provided by the user. Paused signal is emitted when application is paused
           */
-        public event DaliEventHandler<object, NUIApplicationPausedEventArgs> Paused
+        public event DaliEventHandler<object, NUIApplicationPauseEventArgs> Paused
         {
             add
             {
@@ -561,7 +561,7 @@ namespace Tizen.NUI
         // Callback for Application PauseSignal
         private void OnNUIApplicationPause(IntPtr data)
         {
-            NUIApplicationPausedEventArgs e = new NUIApplicationPausedEventArgs();
+            NUIApplicationPauseEventArgs e = new NUIApplicationPauseEventArgs();
 
             // Populate all members of "e" (NUIApplicationPauseEventArgs) with real data
             e.Application = Application.GetApplicationFromPtr(data);
@@ -578,7 +578,7 @@ namespace Tizen.NUI
           * (in the type of NUIApplicationResumeEventHandler-DaliEventHandler<object,NUIApplicationResumeEventArgs>)
           *  provided by the user. Resumed signal is emitted when application is resumed
           */
-        public event DaliEventHandler<object, NUIApplicationResumedEventArgs> Resumed
+        public event DaliEventHandler<object, NUIApplicationResumeEventArgs> Resumed
         {
             add
             {
@@ -612,7 +612,7 @@ namespace Tizen.NUI
         // Callback for Application ResumeSignal
         private void OnNUIApplicationResume(IntPtr data)
         {
-            NUIApplicationResumedEventArgs e = new NUIApplicationResumedEventArgs();
+            NUIApplicationResumeEventArgs e = new NUIApplicationResumeEventArgs();
 
             // Populate all members of "e" (NUIApplicationResumeEventArgs) with real data
             e.Application = Application.GetApplicationFromPtr(data);
@@ -680,7 +680,7 @@ namespace Tizen.NUI
           * (in the type of NUIApplicationResizeEventHandler-DaliEventHandler<object,NUIApplicationResizeEventArgs>)
           *  provided by the user. Resized signal is emitted when application is resized
           */
-        public event DaliEventHandler<object, NUIApplicationResizedEventArgs> Resized
+        public event DaliEventHandler<object, NUIApplicationResizeEventArgs> Resized
         {
             add
             {
@@ -714,7 +714,7 @@ namespace Tizen.NUI
         // Callback for Application ResizeSignal
         private void OnNUIApplicationResize(IntPtr data)
         {
-            NUIApplicationResizedEventArgs e = new NUIApplicationResizedEventArgs();
+            NUIApplicationResizeEventArgs e = new NUIApplicationResizeEventArgs();
 
             // Populate all members of "e" (NUIApplicationResizeEventArgs) with real data
             e.Application = Application.GetApplicationFromPtr(data);
index 7152e60..f398e7a 100755 (executable)
@@ -111,7 +111,7 @@ namespace Tizen.NUI.BaseComponents
         private void OnResourceReady(IntPtr data)
         {
             ResourceReadyEventArgs e = new ResourceReadyEventArgs();
-            if(data != null)
+            if (data != null)
             {
                 e.View = View.GetViewFromPtr(data);
             }
@@ -130,7 +130,7 @@ namespace Tizen.NUI.BaseComponents
                 return;
             }
 
-            if(type == DisposeTypes.Explicit)
+            if (type == DisposeTypes.Explicit)
             {
                 //Called by User
                 //Release your own managed resources here.
@@ -188,16 +188,12 @@ namespace Tizen.NUI.BaseComponents
         {
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
 
-        }
-
+        }\r
+\r
         /// <summary>
-        /// Downcasts a handle to ImageView handle.<br>
-        /// If handle points to a ImageView, the downcast produces valid handle.<br>
-        /// If not, the returned handle is left uninitialized.<br>
+        /// this method will be changed as internal method on later release
         /// </summary>
-        /// <param name="handle">Handle to an object</param>
-        /// <returns>Handle to a ImageView or an uninitialized handle</returns>
-        internal new static ImageView DownCast(BaseHandle handle)
+        public new static ImageView DownCast(BaseHandle handle)
         {
             ImageView ret = new ImageView(NDalicPINVOKE.ImageView_DownCast(BaseHandle.getCPtr(handle)), true);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
@@ -219,7 +215,8 @@ namespace Tizen.NUI.BaseComponents
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
 
-        internal ViewResourceReadySignal ResourceReadySignal(View view) {
+        internal ViewResourceReadySignal ResourceReadySignal(View view)\r
+        {
             ViewResourceReadySignal ret = new ViewResourceReadySignal(NDalicPINVOKE.ResourceReadySignal(View.getCPtr(view)), false);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             return ret;
@@ -383,7 +380,7 @@ namespace Tizen.NUI.BaseComponents
                     if (_synchronousLoading != null) _nPatchMap.Add(NpatchImageVisualProperty.SynchronousLoading, new PropertyValue((bool)_synchronousLoading));
                     SetProperty(ImageView.Property.IMAGE, new PropertyValue(_nPatchMap));
                 }
-                else if(_synchronousLoading != null)
+                else if (_synchronousLoading != null)
                 { // for normal image, with synchronous loading property
                     PropertyMap imageMap = new PropertyMap();
                     imageMap.Add(Visual.Property.Type, new PropertyValue((int)Visual.Type.Image));
index 7d8c0c7..432cf86 100755 (executable)
@@ -328,13 +328,9 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// Downcasts a handle to TableView handle.<br>
-        /// If handle points to a TableView, the downcast produces valid handle.<br>
-        /// If not, the returned handle is left uninitialized.<br>
+        /// this method will be changed as internal method on later release
         /// </summary>
-        /// <param name="handle">Handle to an object</param>
-        /// <returns>Handle to a TableView or an uninitialized handle</returns>
-        internal new static TableView DownCast(BaseHandle handle)
+        public new static TableView DownCast(BaseHandle handle)
         {
             TableView ret = new TableView(NDalicPINVOKE.TableView_DownCast(BaseHandle.getCPtr(handle)), true);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
index 26fd4c2..3b40ef5 100755 (executable)
@@ -331,11 +331,9 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// Downcasts a handle to TextEditor.
+        /// this method will be changed as internal method on later release
         /// </summary>
-        /// <param name="handle">Handle to an object</param>
-        /// <returns>Handle to a TextEditor or an empty handle</returns>
-        internal new static TextEditor DownCast(BaseHandle handle)
+        public new static TextEditor DownCast(BaseHandle handle)
         {
             TextEditor ret = new TextEditor(NDalicPINVOKE.TextEditor_DownCast(BaseHandle.getCPtr(handle)), true);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
index db3c3e7..fa90ade 100755 (executable)
@@ -312,11 +312,9 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// Downcasts a handle to TextField.
+        /// this method will be changed as internal method on later release
         /// </summary>
-        /// <param name="handle">Handle to an object</param>
-        /// <returns>Handle to a TextField or an empty handle</returns>
-        internal new static TextField DownCast(BaseHandle handle)
+        public new static TextField DownCast(BaseHandle handle)
         {
             TextField ret = new TextField(NDalicPINVOKE.TextField_DownCast(BaseHandle.getCPtr(handle)), true);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
index 0ebbfe1..5b8b045 100755 (executable)
@@ -110,8 +110,8 @@ namespace Tizen.NUI.BaseComponents
             internal static readonly int PIXEL_SIZE = NDalicManualPINVOKE.TextLabel_Property_PIXEL_SIZE_get();
             internal static readonly int ELLIPSIS = NDalicManualPINVOKE.TextLabel_Property_ELLIPSIS_get();
             internal static readonly int AUTO_SCROLL_STOP_MODE = NDalicManualPINVOKE.TextLabel_Property_AUTO_SCROLL_STOP_MODE_get();
-            internal static readonly int AUTO_SCROLL_LOOP_DELAY = NDalicManualPINVOKE.TextLabel_Property_AUTO_SCROLL_LOOP_DELAY_get();
-
+            internal static readonly int AUTO_SCROLL_LOOP_DELAY = NDalicManualPINVOKE.TextLabel_Property_AUTO_SCROLL_LOOP_DELAY_get();\r
+            internal static readonly int LINE_COUNT = OUTLINE + 5;
         }
 
         /// <summary>
@@ -139,10 +139,9 @@ namespace Tizen.NUI.BaseComponents
 
 
         /// <summary>
-        /// Downcasts a handle to TextLabel.
+        /// this method will be changed as internal method on later release
         /// </summary>
-        /// <param name="handle">Handle to an object</param>
-        internal new static TextLabel DownCast(BaseHandle handle)
+        public new static TextLabel DownCast(BaseHandle handle)
         {
             TextLabel ret = new TextLabel(NDalicPINVOKE.TextLabel_DownCast(BaseHandle.getCPtr(handle)), true);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
@@ -725,6 +724,19 @@ namespace Tizen.NUI.BaseComponents
             {
                 SetProperty(TextLabel.Property.AUTO_SCROLL_STOP_MODE, new Tizen.NUI.PropertyValue((int)value));
             }
+        }\r
+\r
+        /// <summary>
+        /// The line count of text.
+        /// </summary>
+        public int LineCount
+        {
+            get
+            {
+                int temp = 0;
+                GetProperty(TextLabel.Property.LINE_COUNT).Get(out temp);
+                return temp;
+            }
         }
 
     }
index 13e4b4b..a73b79a 100755 (executable)
@@ -192,13 +192,9 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// Downcasts a handle to VideoView handle.<br>
-        /// If handle points to a VideoView, the downcast produces valid handle.<br>
-        /// If not, the returned handle is left uninitialized.<br>
+        /// this method will be changed as internal method on later release
         /// </summary>
-        /// <param name="handle">Handle to an object</param>
-        /// <returns>Handle to a VideoView or an uninitialized handle</returns>
-        internal new static VideoView DownCast(BaseHandle handle)
+        public new static VideoView DownCast(BaseHandle handle)
         {
             VideoView ret = new VideoView(NDalicPINVOKE.VideoView_DownCast(BaseHandle.getCPtr(handle)), true);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
index eeaec42..aea436b 100755 (executable)
@@ -282,7 +282,7 @@ namespace Tizen.NUI.BaseComponents
         /// <summary>
         /// Event arguments that passed via Touch signal.
         /// </summary>
-        public class TouchedEventArgs : EventArgs
+        public class TouchEventArgs : EventArgs
         {
             private Touch _touch;
 
@@ -302,7 +302,7 @@ namespace Tizen.NUI.BaseComponents
             }
         }
 
-        private EventHandlerWithReturnType<object, TouchedEventArgs, bool> _touchDataEventHandler;
+        private EventHandlerWithReturnType<object, TouchEventArgs, bool> _touchDataEventHandler;
         [UnmanagedFunctionPointer(CallingConvention.StdCall)]
         private delegate bool TouchDataCallbackType(IntPtr view, IntPtr touchData);
         private TouchDataCallbackType _touchDataCallback;
@@ -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.<br>
         /// Touched signal is emitted when touch input is received.<br>
         /// </summary>
-        public event EventHandlerWithReturnType<object, TouchedEventArgs, bool> Touched
+        public event EventHandlerWithReturnType<object, TouchEventArgs, bool> Touch
         {
             add
             {
@@ -339,7 +339,7 @@ namespace Tizen.NUI.BaseComponents
         // Callback for View TouchSignal
         private bool OnTouch(IntPtr view, IntPtr touchData)
         {
-            TouchedEventArgs e = new TouchedEventArgs();
+            TouchEventArgs e = new TouchEventArgs();
 
             e.Touch = Tizen.NUI.Touch.GetTouchFromPtr(touchData);
 
@@ -354,7 +354,7 @@ namespace Tizen.NUI.BaseComponents
         /// <summary>
         /// Event arguments that passed via Hover signal.
         /// </summary>
-        public class HoveredEventArgs : EventArgs
+        public class HoverEventArgs : EventArgs
         {
             private Hover _hover;
 
@@ -374,7 +374,7 @@ namespace Tizen.NUI.BaseComponents
             }
         }
 
-        private EventHandlerWithReturnType<object, HoveredEventArgs, bool> _hoverEventHandler;
+        private EventHandlerWithReturnType<object, HoverEventArgs, bool> _hoverEventHandler;
         [UnmanagedFunctionPointer(CallingConvention.StdCall)]
         private delegate bool HoverEventCallbackType(IntPtr view, IntPtr hoverEvent);
         private HoverEventCallbackType _hoverEventCallback;
@@ -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.<br>
         /// Hovered signal is emitted when hover input is received.<br>
         /// </summary>
-        public event EventHandlerWithReturnType<object, HoveredEventArgs, bool> Hovered
+        public event EventHandlerWithReturnType<object, HoverEventArgs, bool> Hover
         {
             add
             {
@@ -411,7 +411,7 @@ namespace Tizen.NUI.BaseComponents
         // Callback for View Hover signal
         private bool OnHoverEvent(IntPtr view, IntPtr hoverEvent)
         {
-            HoveredEventArgs e = new HoveredEventArgs();
+            HoverEventArgs e = new HoverEventArgs();
 
             e.Hover = Tizen.NUI.Hover.GetHoverFromPtr(hoverEvent);
 
@@ -426,7 +426,7 @@ namespace Tizen.NUI.BaseComponents
         /// <summary>
         /// Event arguments that passed via Wheel signal.
         /// </summary>
-        public class WheelRolledEventArgs : EventArgs
+        public class WheelEventArgs : EventArgs
         {
             private Wheel _wheel;
 
@@ -446,7 +446,7 @@ namespace Tizen.NUI.BaseComponents
             }
         }
 
-        private EventHandlerWithReturnType<object, WheelRolledEventArgs, bool> _wheelEventHandler;
+        private EventHandlerWithReturnType<object, WheelEventArgs, bool> _wheelEventHandler;
         [UnmanagedFunctionPointer(CallingConvention.StdCall)]
         private delegate bool WheelEventCallbackType(IntPtr view, IntPtr wheelEvent);
         private WheelEventCallbackType _wheelEventCallback;
@@ -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.<br>
         /// WheelMoved signal is emitted when wheel event is received.<br>
         /// </summary>
-        public event EventHandlerWithReturnType<object, WheelRolledEventArgs, bool> WheelRolled
+        public event EventHandlerWithReturnType<object, WheelEventArgs, bool> WheelRoll
         {
             add
             {
@@ -483,7 +483,7 @@ namespace Tizen.NUI.BaseComponents
         // Callback for View Wheel signal
         private bool OnWheelEvent(IntPtr view, IntPtr wheelEvent)
         {
-            WheelRolledEventArgs e = new WheelRolledEventArgs();
+            WheelEventArgs e = new WheelEventArgs();
 
             e.Wheel = Tizen.NUI.Wheel.GetWheelFromPtr(wheelEvent);
 
@@ -1058,7 +1058,7 @@ namespace Tizen.NUI.BaseComponents
         /// Create an Animation to animate the background color visual. If there is no
         /// background visual, creates one with transparent black as it's mixColor.
         /// </summary>
-        public Animation AnimateBackgroundColor( object destinationValue,
+        public Animation AnimateBackgroundColor(object destinationValue,
                                                  int startTime,
                                                  int endTime,
                                                  AlphaFunction.BuiltinFunctions? alphaFunction = null,
@@ -1066,50 +1066,50 @@ namespace Tizen.NUI.BaseComponents
         {
             Tizen.NUI.PropertyMap background = Background;
 
-            if( background.Empty() )
+            if (background.Empty())
             {
                 // If there is no background yet, ensure there is a transparent
                 // color visual
                 BackgroundColor = new Color(0.0f, 0.0f, 0.0f, 0.0f);
                 background = Background;
             }
-            return AnimateColor( "background", destinationValue, startTime, endTime, alphaFunction, initialValue );
+            return AnimateColor("background", destinationValue, startTime, endTime, alphaFunction, initialValue);
         }
 
         /// <summary>
         /// Create an Animation to animate the mixColor of the named visual.
         /// </summary>
-        public Animation AnimateColor( string targetVisual, object destinationColor, int startTime, int endTime, AlphaFunction.BuiltinFunctions? alphaFunction = null, object initialColor = null )
+        public Animation AnimateColor(string targetVisual, object destinationColor, int startTime, int endTime, AlphaFunction.BuiltinFunctions? alphaFunction = null, object initialColor = null)
         {
             Animation animation = null;
             {
                 PropertyMap _animator = new PropertyMap();
-                if( alphaFunction != null )
+                if (alphaFunction != null)
                 {
-                    _animator.Add("alphaFunction", new PropertyValue( AlphaFunction.BuiltinToPropertyKey(alphaFunction) ) );
+                    _animator.Add("alphaFunction", new PropertyValue(AlphaFunction.BuiltinToPropertyKey(alphaFunction)));
                 }
 
                 PropertyMap _timePeriod = new PropertyMap();
-                _timePeriod.Add( "duration", new PropertyValue((endTime-startTime)/1000.0f) );
-                _timePeriod.Add( "delay", new PropertyValue( startTime/1000.0f ) );
-                _animator.Add( "timePeriod", new PropertyValue( _timePeriod ) );
+                _timePeriod.Add("duration", new PropertyValue((endTime - startTime) / 1000.0f));
+                _timePeriod.Add("delay", new PropertyValue(startTime / 1000.0f));
+                _animator.Add("timePeriod", new PropertyValue(_timePeriod));
 
                 PropertyMap _transition = new PropertyMap();
-                _transition.Add( "animator", new PropertyValue( _animator ) );
-                _transition.Add( "target", new PropertyValue( targetVisual ) );
-                _transition.Add( "property", new PropertyValue( "mixColor" ) );
+                _transition.Add("animator", new PropertyValue(_animator));
+                _transition.Add("target", new PropertyValue(targetVisual));
+                _transition.Add("property", new PropertyValue("mixColor"));
 
-                if( initialColor != null )
+                if (initialColor != null)
                 {
-                    PropertyValue initValue = PropertyValue.CreateFromObject( initialColor );
-                    _transition.Add( "initialValue", initValue );
+                    PropertyValue initValue = PropertyValue.CreateFromObject(initialColor);
+                    _transition.Add("initialValue", initValue);
                 }
 
-                PropertyValue destValue = PropertyValue.CreateFromObject( destinationColor );
-                _transition.Add( "targetValue", destValue );
-                TransitionData _transitionData = new TransitionData( _transition );
+                PropertyValue destValue = PropertyValue.CreateFromObject(destinationColor);
+                _transition.Add("targetValue", destValue);
+                TransitionData _transitionData = new TransitionData(_transition);
 
-                animation = new Animation( NDalicManualPINVOKE.View_CreateTransition(swigCPtr, TransitionData.getCPtr(_transitionData)), true );
+                animation = new Animation(NDalicManualPINVOKE.View_CreateTransition(swigCPtr, TransitionData.getCPtr(_transitionData)), true);
                 if (NDalicPINVOKE.SWIGPendingException.Pending)
                     throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             }
@@ -1146,7 +1146,7 @@ namespace Tizen.NUI.BaseComponents
             get
             {
                 Tizen.NUI.PropertyMap temp = new Tizen.NUI.PropertyMap();
-                GetProperty( View.Property.BACKGROUND ).Get(temp);
+                GetProperty(View.Property.BACKGROUND).Get(temp);
                 return temp;
             }
             set
@@ -3656,6 +3656,16 @@ namespace Tizen.NUI.BaseComponents
                 SetProperty(View.Property.CLIPPING_MODE, new Tizen.NUI.PropertyValue((int)value));
             }
         }
+        /// <summary>
+        /// Get the number of renderers held by the view.
+        /// </summary>
+        public uint RendererCount
+        {
+            get
+            {
+                return GetRendererCount();
+            }
+        }
 
 
 
@@ -3664,6 +3674,9 @@ namespace Tizen.NUI.BaseComponents
         /*********************************************************************************/
         /*** will be removed/deprecated                                                  ***/
         /*********************************************************************************/
+        /// <summary>
+        /// will be deprecated at nui_0.2.50
+        /// </summary>
         public event EventHandlerWithReturnType<object, TouchEventArgs, bool> Touched
         {
             add
@@ -3688,6 +3701,9 @@ namespace Tizen.NUI.BaseComponents
 
             }
         }
+        /// <summary>
+        /// will be deprecated at nui_0.2.50
+        /// </summary>
         public event EventHandlerWithReturnType<object, HoverEventArgs, bool> Hovered
         {
             add
@@ -3712,17 +3728,176 @@ namespace Tizen.NUI.BaseComponents
 
             }
         }
+        /// <summary>
+        /// will be deprecated at nui_0.2.50
+        /// </summary>
+        public event EventHandlerWithReturnType<object, WheelEventArgs, bool> WheelMoved
+        {
+            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);
+                }
+
+            }
+        }
         /// <summary>
-        /// Get the number of renderers held by the view.
+        /// will be deprecated at nui_0.2.50
         /// </summary>
-        public uint RendererCount
+        public Position AnchorPoint
         {
             get
             {
-                return GetRendererCount();
+                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));
+            }
+        }
+        /// <summary>
+        /// will be deprecated at nui_0.2.50
+        /// </summary>
+        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));
+            }
+        }\r
+        /// <summary>
+        /// will be deprecated at nui_0.2.50
+        /// </summary>
+        public event EventHandler OnWindowEvent
+        {
+            add
+            {
+                if (_onWindowEventHandler == null)
+                {
+                    _onWindowEventCallback = OnWindow;
+                    this.OnWindowSignal().Connect(_onWindowEventCallback);
+                }
+
+                _onWindowEventHandler += value;
+            }
+
+            remove
+            {
+                _onWindowEventHandler -= value;
+
+                if (_onWindowEventHandler == null && OnWindowSignal().Empty() == false)
+                {
+                    this.OnWindowSignal().Disconnect(_onWindowEventCallback);
+                }
             }
         }
+        /// <summary>
+        /// will be deprecated at nui_0.2.50
+        /// </summary>
+        public event EventHandler OffWindowEvent
+        {
+            add
+            {
+                if (_offWindowEventHandler == null)
+                {
+                    _offWindowEventCallback = OffWindow;
+                    this.OffWindowSignal().Connect(_offWindowEventCallback);
+                }
+
+                _offWindowEventHandler += value;
+            }
+
+            remove
+            {
+                _offWindowEventHandler -= value;
+
+                if (_offWindowEventHandler == null && OffWindowSignal().Empty() == false)
+                {
+                    this.OffWindowSignal().Disconnect(_offWindowEventCallback);
+                }
+            }
+        }
+        /// <summary>
+        /// will be deprecated at nui_0.2.50
+        /// </summary>
+        public event EventHandler OnRelayoutEvent
+        {
+            add
+            {
+                if (_onRelayoutEventHandler == null)
+                {
+                    _onRelayoutEventCallback = OnRelayout;
+                    this.OnRelayoutSignal().Connect(_onRelayoutEventCallback);
+                }
+
+                _onRelayoutEventHandler += value;
+            }
+
+            remove
+            {
+                _onRelayoutEventHandler -= value;
+
+                if (_onRelayoutEventHandler == null && OnRelayoutSignal().Empty() == false)
+                {
+                    this.OnRelayoutSignal().Disconnect(_onRelayoutEventCallback);
+                }
+
+            }
+        }\r
+        /// <summary>
+        /// will be deprecated at nui_0.2.50
+        /// </summary>
+        public event EventHandlerWithReturnType<object, KeyEventArgs, bool> KeyEvent
+        {
+            add
+            {
+                if (_keyEventHandler == null)
+                {
+                    _keyCallback = OnKeyEvent;
+                    this.KeyEventSignal().Connect(_keyCallback);
+                }
+
+                _keyEventHandler += value;
+            }
+
+            remove
+            {
+                _keyEventHandler -= value;
+
+                if (_keyEventHandler == null && KeyEventSignal().Empty() == false)
+                {
+                    this.KeyEventSignal().Disconnect(_keyCallback);
+                }
+            }
+        }
+
+
+        /*********************************************************************************/
+        /*** will be removed/deprecated                                                  ***/
+        /*********************************************************************************/
+
 
     }
 }
index 4ebae95..8419eba 100755 (executable)
@@ -682,6 +682,75 @@ namespace Tizen.NUI
                 View proposedView = View.DownCast<View>(proposed);
                 return _customFocusAlgorithm.GetNextFocusableView(currentView, proposedView, direction);
             }
-        }
+        }\r
+\r
+\r
+        /*********************************************************************************/\r
+        /*** will be removed/deprecated                                                  ***/\r
+        /*********************************************************************************/\r
+\r
+        ///<summary>\r
+        ///Event arguments that passed via FocusedViewEnterKey signal\r
+        /// </summary>\r
+        public class FocusedViewEnterKeyEventArgs : EventArgs\r
+        {\r
+            private View _view;\r
+\r
+            public View View\r
+            {\r
+                get\r
+                {\r
+                    return _view;\r
+                }\r
+                set\r
+                {\r
+                    _view = value;\r
+                }\r
+            }\r
+        }\r
+\r
+        private EventHandler<FocusedViewEnterKeyEventArgs> _focusedViewEnterKeyEventHandler2;
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private delegate void FocusedViewEnterKeyEventCallback2(IntPtr view);
+        private FocusedViewEnterKeyEventCallback2 _focusedViewEnterKeyEventCallback2;
+\r
+        /// <summary>\r
+        /// FocusedViewActivated will be triggered when the current focused view has the enter key pressed on it.\r
+        /// </summary>\r
+        public event EventHandler<FocusedViewEnterKeyEventArgs> FocusedViewEnterKeyPressed\r
+        {\r
+            add\r
+            {\r
+                if (_focusedViewEnterKeyEventCallback2 == null)\r
+                {\r
+                    _focusedViewEnterKeyEventCallback2 = OnFocusedViewEnterKey2;\r
+                    FocusedViewEnterKeySignal().Connect(_focusedViewEnterKeyEventCallback2);\r
+                }\r
+                _focusedViewEnterKeyEventHandler2 += value;\r
+            }\r
+            remove\r
+            {\r
+                _focusedViewEnterKeyEventHandler2 -= value;\r
+\r
+                if (_focusedViewEnterKeyEventCallback2 == null && FocusedViewEnterKeySignal().Empty() == false)\r
+                {\r
+                    FocusedViewEnterKeySignal().Disconnect(_focusedViewEnterKeyEventCallback2);\r
+                }\r
+            }\r
+        }\r
+\r
+        private void OnFocusedViewEnterKey2(IntPtr view)\r
+        {\r
+            FocusedViewEnterKeyEventArgs e = new FocusedViewEnterKeyEventArgs();\r
+\r
+            e.View = View.GetViewFromPtr(view);\r
+\r
+            if (_focusedViewEnterKeyEventHandler2 != null)\r
+            {\r
+                _focusedViewEnterKeyEventHandler2(this, e);\r
+            }\r
+        }\r
+        
+
     }
 }
index 225157f..0043e3b 100755 (executable)
@@ -110,13 +110,9 @@ namespace Tizen.NUI
 
         }
         /// <summary>
-        /// Downcasts a handle to KeyFrames handle.<br>
-        /// If handle points to a KeyFrames object, the downcast produces valid handle.<br>
-        /// If not, the returned handle is left uninitialized.<br>
+        /// this method will be changed as internal method on later release
         /// </summary>
-        /// <param name="handle">Handle to an object</param>
-        /// <returns>Handle to a KeyFrames object or an uninitialized handle</returns>
-        internal static KeyFrames DownCast(BaseHandle handle)
+        public static KeyFrames DownCast(BaseHandle handle)
         {
             KeyFrames ret = new KeyFrames(NDalicPINVOKE.KeyFrames_DownCast(BaseHandle.getCPtr(handle)), true);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
index 52ad9d7..4fbf526 100755 (executable)
-/** 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
-{
-    using Tizen.NUI.BaseComponents;
-
-    /// <summary>
-    /// Layers provide a mechanism for overlaying groups of actors on top of each other.
-    /// </summary>
-    public class Layer : Animatable
-    {
-        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-
-        internal Layer(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Layer_SWIGUpcast(cPtr), cMemoryOwn)
-        {
-            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-        }
-
-        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Layer obj)
-        {
-            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-        }
-
-        protected override 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_Layer(swigCPtr);
-                }
-                swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-            }
-
-            base.Dispose(type);
-        }
-
-
-        internal class Property
-        {
-            internal static readonly int BEHAVIOR = NDalicPINVOKE.Layer_Property_BEHAVIOR_get();
-        }
-
-        /// <summary>
-        /// Creates a Layer object.
-        /// </summary>
-        public Layer() : this(NDalicPINVOKE.Layer_New(), true)
-        {
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-
-        }
-        /// <summary>
-        /// Downcasts a handle to Layer handle.<br>
-        /// If handle points to a Layer, the downcast produces valid handle.<br>
-        /// If not, the returned handle is left uninitialized.<br>
-        /// </summary>
-        /// <param name="handle">Handle to an object</param>
-        /// <returns>Handle to a Layer or an uninitialized handle</returns>
-        internal new static Layer DownCast(BaseHandle handle)
-        {
-            Layer ret = new Layer(NDalicPINVOKE.Layer_DownCast(BaseHandle.getCPtr(handle)), true);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-        /// <summary>
-        /// Search through this layer's hierarchy for an view with the given unique ID.
-        /// </summary>
-        /// <pre>This layer(the parent) has been initialized.</pre>
-        /// <remarks>The actor itself is also considered in the search.</remarks>
-        /// <param name="child">The id of the child to find</param>
-        /// <returns> A handle to the view if found, or an empty handle if not. </returns>
-        public View FindChildById(uint id)
-        {
-            View ret = new View(NDalicPINVOKE.Actor_FindChildById(swigCPtr, id), true);
-            if (NDalicPINVOKE.SWIGPendingException.Pending)
-                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-        /// <summary>
-        /// Adds a child view to this layer.
-        /// </summary>
-        /// <pre>This layer(the parent) has been initialized. The child view has been initialized. The child view is not the same as the parent layer.</pre>
-        /// <post>The child will be referenced by its parent. This means that the child will be kept alive, even if the handle passed into this method is reset or destroyed.</post>
-        /// <remarks>If the child already has a parent, it will be removed from old parent and reparented to this layer. This may change child's position, color, scale etc as it now inherits them from this layer.</remarks>
-        /// <param name="child">The child</param>
-        public void Add(View child)
-        {
-            NDalicPINVOKE.Actor_Add(swigCPtr, View.getCPtr(child));
-            if (NDalicPINVOKE.SWIGPendingException.Pending)
-                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
-        /// <summary>
-        /// Removes a child View from this layer. If the view was not a child of this layer, this is a no-op.
-        /// </summary>
-        /// <pre>This layer(the parent) has been initialized. The child view is not the same as the parent view.</pre>
-        /// <param name="child">The child</param>
-        public void Remove(View child)
-        {
-            NDalicPINVOKE.Actor_Remove(swigCPtr, View.getCPtr(child));
-            if (NDalicPINVOKE.SWIGPendingException.Pending)
-                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
-        /// <summary>
-        /// Queries the depth of the layer.<br>
-        /// 0 is the bottom most layer, higher number is on top.<br>
-        /// </summary>
-        public uint Depth
-        {
-            get
-            {
-                return GetDepth();
-            }
-        }
-
-        internal uint GetDepth()
-        {
-            uint ret = NDalicPINVOKE.Layer_GetDepth(swigCPtr);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-        /// <summary>
-        /// Increments the depth of the layer.
-        /// </summary>
-        public void Raise()
-        {
-            NDalicPINVOKE.Layer_Raise(swigCPtr);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
-        /// <summary>
-        /// Decrements the depth of the layer.
-        /// </summary>
-        public void Lower()
-        {
-            NDalicPINVOKE.Layer_Lower(swigCPtr);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
-        internal void RaiseAbove(Layer target)
-        {
-            NDalicPINVOKE.Layer_RaiseAbove(swigCPtr, Layer.getCPtr(target));
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
-        internal void LowerBelow(Layer target)
-        {
-            NDalicPINVOKE.Layer_LowerBelow(swigCPtr, Layer.getCPtr(target));
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
-        /// <summary>
-        /// Raises the layer to the top.
-        /// </summary>
-        public void RaiseToTop()
-        {
-            NDalicPINVOKE.Layer_RaiseToTop(swigCPtr);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
-        /// <summary>
-        /// Lowers the layer to the bottom.
-        /// </summary>
-        public void LowerToBottom()
-        {
-            NDalicPINVOKE.Layer_LowerToBottom(swigCPtr);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
-        /// <summary>
-        /// Moves the layer directly above the given layer.<br>
-        /// After the call, this layers depth will be immediately above target.<br>
-        /// </summary>
-        /// <param name="target">Layer to get on top of</param>
-        public void MoveAbove(Layer target)
-        {
-            NDalicPINVOKE.Layer_MoveAbove(swigCPtr, Layer.getCPtr(target));
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
-        /// <summary>
-        /// Moves the layer directly below the given layer.<br>
-        /// After the call, this layers depth will be immediately below target.<br>
-        /// </summary>
-        /// <param name="target">Layer to get below of</param>
-        public void MoveBelow(Layer target)
-        {
-            NDalicPINVOKE.Layer_MoveBelow(swigCPtr, Layer.getCPtr(target));
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
-        private void SetBehavior(LayerBehavior behavior)
-        {
-            NDalicPINVOKE.Layer_SetBehavior(swigCPtr, (int)behavior);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
-        private LayerBehavior GetBehavior()
-        {
-            Layer.LayerBehavior ret = (Layer.LayerBehavior)NDalicPINVOKE.Layer_GetBehavior(swigCPtr);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-        internal void SetSortFunction(SWIGTYPE_p_f_r_q_const__Dali__Vector3__float function)
-        {
-            NDalicPINVOKE.Layer_SetSortFunction(swigCPtr, SWIGTYPE_p_f_r_q_const__Dali__Vector3__float.getCPtr(function));
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
-        internal void SetTouchConsumed(bool consume)
-        {
-            NDalicPINVOKE.Layer_SetTouchConsumed(swigCPtr, consume);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
-        internal bool IsTouchConsumed()
-        {
-            bool ret = NDalicPINVOKE.Layer_IsTouchConsumed(swigCPtr);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-        internal void SetHoverConsumed(bool consume)
-        {
-            NDalicPINVOKE.Layer_SetHoverConsumed(swigCPtr, consume);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
-        internal bool IsHoverConsumed()
-        {
-            bool ret = NDalicPINVOKE.Layer_IsHoverConsumed(swigCPtr);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-        /// <summary>
-        /// Retrieves child view by index.
-        /// </summary>
-        /// <pre>The View has been initialized.</pre>
-        /// <param name="index">The index of the child to retrieve</param>
-        /// <returns>The view for the given index or empty handle if children not initialized</returns>
-        public View GetChildAt(uint index)
-        {
-            System.IntPtr cPtr = NDalicPINVOKE.Actor_GetChildAt(swigCPtr, index);
-            cPtr = NDalicPINVOKE.View_SWIGUpcast(cPtr);
-            cPtr = NDalicPINVOKE.Handle_SWIGUpcast(cPtr);
-
-            BaseHandle ret = new BaseHandle(cPtr, false);
-
-            View temp = ViewRegistry.GetViewFromBaseHandle(ret);
-
-            if (NDalicPINVOKE.SWIGPendingException.Pending)
-                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-
-            return temp ?? null;
-        }
-
-        /// <summary>
-        /// Enumeration for the behavior of the layer.
-        /// </summary>
-        public enum LayerBehavior
-        {
-            Layer2D,
-            LayerUI = Layer2D,
-            Layer3D
-        }
-
-        internal enum TreeDepthMultiplier
-        {
-            TREE_DEPTH_MULTIPLIER = 10000
-        }
-
-        /// <summary>
-        /// Layer Behavior, type String(Layer.LayerBehavior)
-        /// </summary>
-        public Layer.LayerBehavior Behavior
-        {
-            get
-            {
-                return GetBehavior();
-            }
-            set
-            {
-                SetBehavior(value);
-            }
-        }
-
-        /// <summary>
-        /// Retrieves and sets the Layer's opacity.<br>
-        /// </summary>
-        public float Opacity
-        {
-            get
-            {
-                float temp = 0.0f;
-                GetProperty(View.Property.OPACITY).Get(out temp);
-                return temp;
-            }
-            set
-            {
-                SetProperty(View.Property.OPACITY, new Tizen.NUI.PropertyValue(value));
-            }
-        }
-
-        /// <summary>
-        /// Retrieves and sets the Layer's visibility.
-        /// </summary>
-        public bool Visibility
-        {
-            get
-            {
-                bool temp = false;
-                GetProperty(View.Property.VISIBLE).Get(out temp);
-                return temp;
-            }
-            set
-            {
-                SetProperty(View.Property.VISIBLE, new Tizen.NUI.PropertyValue(value));
-            }
-        }
-
+/** Copyright (c) 2017 Samsung Electronics Co., Ltd.\r
+*\r
+* Licensed under the Apache License, Version 2.0 (the "License");\r
+* you may not use this file except in compliance with the License.\r
+* You may obtain a copy of the License at\r
+*\r
+* http://www.apache.org/licenses/LICENSE-2.0\r
+*\r
+* Unless required by applicable law or agreed to in writing, software\r
+* distributed under the License is distributed on an "AS IS" BASIS,\r
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+* See the License for the specific language governing permissions and\r
+* limitations under the License.\r
+*\r
+*/\r
+\r
+namespace Tizen.NUI\r
+{\r
+    using Tizen.NUI.BaseComponents;\r
+\r
+    /// <summary>\r
+    /// Layers provide a mechanism for overlaying groups of actors on top of each other.\r
+    /// </summary>\r
+    public class Layer : Animatable\r
+    {\r
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;\r
+\r
+        internal Layer(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Layer_SWIGUpcast(cPtr), cMemoryOwn)\r
+        {\r
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);\r
+        }\r
+\r
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Layer obj)\r
+        {\r
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;\r
+        }\r
+\r
+        protected override void Dispose(DisposeTypes type)\r
+        {\r
+            if (disposed)\r
+            {\r
+                return;\r
+            }\r
+\r
+            if (type == DisposeTypes.Explicit)\r
+            {\r
+                //Called by User\r
+                //Release your own managed resources here.\r
+                //You should release all of your own disposable objects here.\r
+            }\r
+\r
+            //Release your own unmanaged resources here.\r
+            //You should not access any managed member here except static instance.\r
+            //because the execution order of Finalizes is non-deterministic.\r
+\r
+            if (swigCPtr.Handle != global::System.IntPtr.Zero)\r
+            {\r
+                if (swigCMemOwn)\r
+                {\r
+                    swigCMemOwn = false;\r
+                    NDalicPINVOKE.delete_Layer(swigCPtr);\r
+                }\r
+                swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);\r
+            }\r
+\r
+            base.Dispose(type);\r
+        }\r
+\r
+\r
+        internal class Property\r
+        {\r
+            internal static readonly int BEHAVIOR = NDalicPINVOKE.Layer_Property_BEHAVIOR_get();\r
+        }\r
+\r
+        /// <summary>\r
+        /// Creates a Layer object.\r
+        /// </summary>\r
+        public Layer() : this(NDalicPINVOKE.Layer_New(), true)\r
+        {\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+\r
+        }\r
         /// <summary>
-        /// Get the number of children held by the layer.
+        /// this method will be changed as internal method on later release
         /// </summary>
-        public uint ChildCount
-        {
-            get
-            {
-                uint ret = NDalicPINVOKE.Actor_GetChildCount(swigCPtr);
-                if (NDalicPINVOKE.SWIGPendingException.Pending)
-                    throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-                return ret;
-            }
+        public new static Layer DownCast(BaseHandle handle)\r
+        {\r
+            Layer ret = new Layer(NDalicPINVOKE.Layer_DownCast(BaseHandle.getCPtr(handle)), true);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        /// <summary>\r
+        /// Search through this layer's hierarchy for an view with the given unique ID.\r
+        /// </summary>\r
+        /// <pre>This layer(the parent) has been initialized.</pre>\r
+        /// <remarks>The actor itself is also considered in the search.</remarks>\r
+        /// <param name="child">The id of the child to find</param>\r
+        /// <returns> A handle to the view if found, or an empty handle if not. </returns>\r
+        public View FindChildById(uint id)\r
+        {\r
+            View ret = new View(NDalicPINVOKE.Actor_FindChildById(swigCPtr, id), true);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending)\r
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        /// <summary>\r
+        /// Adds a child view to this layer.\r
+        /// </summary>\r
+        /// <pre>This layer(the parent) has been initialized. The child view has been initialized. The child view is not the same as the parent layer.</pre>\r
+        /// <post>The child will be referenced by its parent. This means that the child will be kept alive, even if the handle passed into this method is reset or destroyed.</post>\r
+        /// <remarks>If the child already has a parent, it will be removed from old parent and reparented to this layer. This may change child's position, color, scale etc as it now inherits them from this layer.</remarks>\r
+        /// <param name="child">The child</param>\r
+        public void Add(View child)\r
+        {\r
+            NDalicPINVOKE.Actor_Add(swigCPtr, View.getCPtr(child));\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending)\r
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        /// <summary>\r
+        /// Removes a child View from this layer. If the view was not a child of this layer, this is a no-op.\r
+        /// </summary>\r
+        /// <pre>This layer(the parent) has been initialized. The child view is not the same as the parent view.</pre>\r
+        /// <param name="child">The child</param>\r
+        public void Remove(View child)\r
+        {\r
+            NDalicPINVOKE.Actor_Remove(swigCPtr, View.getCPtr(child));\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending)\r
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        /// <summary>\r
+        /// Queries the depth of the layer.<br>\r
+        /// 0 is the bottom most layer, higher number is on top.<br>\r
+        /// </summary>\r
+        public uint Depth\r
+        {\r
+            get\r
+            {\r
+                return GetDepth();\r
+            }\r
+        }\r
+\r
+        internal uint GetDepth()\r
+        {\r
+            uint ret = NDalicPINVOKE.Layer_GetDepth(swigCPtr);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        /// <summary>\r
+        /// Increments the depth of the layer.\r
+        /// </summary>\r
+        public void Raise()\r
+        {\r
+            NDalicPINVOKE.Layer_Raise(swigCPtr);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        /// <summary>\r
+        /// Decrements the depth of the layer.\r
+        /// </summary>\r
+        public void Lower()\r
+        {\r
+            NDalicPINVOKE.Layer_Lower(swigCPtr);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        internal void RaiseAbove(Layer target)\r
+        {\r
+            NDalicPINVOKE.Layer_RaiseAbove(swigCPtr, Layer.getCPtr(target));\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        internal void LowerBelow(Layer target)\r
+        {\r
+            NDalicPINVOKE.Layer_LowerBelow(swigCPtr, Layer.getCPtr(target));\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        /// <summary>\r
+        /// Raises the layer to the top.\r
+        /// </summary>\r
+        public void RaiseToTop()\r
+        {\r
+            NDalicPINVOKE.Layer_RaiseToTop(swigCPtr);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        /// <summary>\r
+        /// Lowers the layer to the bottom.\r
+        /// </summary>\r
+        public void LowerToBottom()\r
+        {\r
+            NDalicPINVOKE.Layer_LowerToBottom(swigCPtr);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        /// <summary>\r
+        /// Moves the layer directly above the given layer.<br>\r
+        /// After the call, this layers depth will be immediately above target.<br>\r
+        /// </summary>\r
+        /// <param name="target">Layer to get on top of</param>\r
+        public void MoveAbove(Layer target)\r
+        {\r
+            NDalicPINVOKE.Layer_MoveAbove(swigCPtr, Layer.getCPtr(target));\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        /// <summary>\r
+        /// Moves the layer directly below the given layer.<br>\r
+        /// After the call, this layers depth will be immediately below target.<br>\r
+        /// </summary>\r
+        /// <param name="target">Layer to get below of</param>\r
+        public void MoveBelow(Layer target)\r
+        {\r
+            NDalicPINVOKE.Layer_MoveBelow(swigCPtr, Layer.getCPtr(target));\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        private void SetBehavior(LayerBehavior behavior)\r
+        {\r
+            NDalicPINVOKE.Layer_SetBehavior(swigCPtr, (int)behavior);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        private LayerBehavior GetBehavior()\r
+        {\r
+            Layer.LayerBehavior ret = (Layer.LayerBehavior)NDalicPINVOKE.Layer_GetBehavior(swigCPtr);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        internal void SetSortFunction(SWIGTYPE_p_f_r_q_const__Dali__Vector3__float function)\r
+        {\r
+            NDalicPINVOKE.Layer_SetSortFunction(swigCPtr, SWIGTYPE_p_f_r_q_const__Dali__Vector3__float.getCPtr(function));\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        internal void SetTouchConsumed(bool consume)\r
+        {\r
+            NDalicPINVOKE.Layer_SetTouchConsumed(swigCPtr, consume);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        internal bool IsTouchConsumed()\r
+        {\r
+            bool ret = NDalicPINVOKE.Layer_IsTouchConsumed(swigCPtr);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        internal void SetHoverConsumed(bool consume)\r
+        {\r
+            NDalicPINVOKE.Layer_SetHoverConsumed(swigCPtr, consume);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        internal bool IsHoverConsumed()\r
+        {\r
+            bool ret = NDalicPINVOKE.Layer_IsHoverConsumed(swigCPtr);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        /// <summary>\r
+        /// Retrieves child view by index.\r
+        /// </summary>\r
+        /// <pre>The View has been initialized.</pre>\r
+        /// <param name="index">The index of the child to retrieve</param>\r
+        /// <returns>The view for the given index or empty handle if children not initialized</returns>\r
+        public View GetChildAt(uint index)\r
+        {\r
+            System.IntPtr cPtr = NDalicPINVOKE.Actor_GetChildAt(swigCPtr, index);\r
+            cPtr = NDalicPINVOKE.View_SWIGUpcast(cPtr);\r
+            cPtr = NDalicPINVOKE.Handle_SWIGUpcast(cPtr);\r
+\r
+            BaseHandle ret = new BaseHandle(cPtr, false);\r
+\r
+            View temp = ViewRegistry.GetViewFromBaseHandle(ret);\r
+\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending)\r
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+\r
+            return temp ?? null;\r
+        }\r
+\r
+        /// <summary>\r
+        /// Enumeration for the behavior of the layer.\r
+        /// </summary>\r
+        public enum LayerBehavior\r
+        {\r
+            Layer2D,\r
+            LayerUI = Layer2D,\r
+            Layer3D\r
+        }\r
+\r
+        internal enum TreeDepthMultiplier\r
+        {\r
+            TREE_DEPTH_MULTIPLIER = 10000\r
+        }\r
+\r
+        /// <summary>\r
+        /// Layer Behavior, type String(Layer.LayerBehavior)\r
+        /// </summary>\r
+        public Layer.LayerBehavior Behavior\r
+        {\r
+            get\r
+            {\r
+                return GetBehavior();\r
+            }\r
+            set\r
+            {\r
+                SetBehavior(value);\r
+            }\r
+        }\r
+\r
+        /// <summary>\r
+        /// Retrieves and sets the Layer's opacity.<br>\r
+        /// </summary>\r
+        public float Opacity\r
+        {\r
+            get\r
+            {\r
+                float temp = 0.0f;\r
+                GetProperty(View.Property.OPACITY).Get(out temp);\r
+                return temp;\r
+            }\r
+            set\r
+            {\r
+                SetProperty(View.Property.OPACITY, new Tizen.NUI.PropertyValue(value));\r
+            }\r
+        }\r
+\r
+        /// <summary>\r
+        /// Retrieves and sets the Layer's visibility.\r
+        /// </summary>\r
+        public bool Visibility\r
+        {\r
+            get\r
+            {\r
+                bool temp = false;\r
+                GetProperty(View.Property.VISIBLE).Get(out temp);\r
+                return temp;\r
+            }\r
+            set\r
+            {\r
+                SetProperty(View.Property.VISIBLE, new Tizen.NUI.PropertyValue(value));\r
+            }\r
+        }\r
+\r
+        /// <summary>\r
+        /// Get the number of children held by the layer.\r
+        /// </summary>\r
+        public uint ChildCount\r
+        {\r
+            get\r
+            {\r
+                uint ret = NDalicPINVOKE.Actor_GetChildCount(swigCPtr);\r
+                if (NDalicPINVOKE.SWIGPendingException.Pending)\r
+                    throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+                return ret;\r
+            }\r
         }\r
 \r
         /// <summary>\r
@@ -398,5 +394,5 @@ namespace Tizen.NUI
             if (NDalicPINVOKE.SWIGPendingException.Pending)\r
                 throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-    }
-}
+    }\r
+}\r
index 307d07f..f1a6b79 100755 (executable)
@@ -90,7 +90,17 @@ namespace Tizen.NUI
         {
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
 
-        }
+        }\r
+\r
+        /// <summary>
+        /// this method will be changed as internal method on later release
+        /// </summary>
+        public new static Path DownCast(BaseHandle handle)\r
+        {\r
+            Path ret = new Path(NDalicPINVOKE.Path_DownCast(BaseHandle.getCPtr(handle)), true);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
 
         /// <summary>
         /// Adds an interpolation point.
index 44447cd..bc143cd 100755 (executable)
@@ -152,11 +152,9 @@ namespace Tizen.NUI
         }
 
         /// <summary>
-        /// Downcasts a handle to Timer handle.
+        /// this method will be changed as internal method on later release
         /// </summary>
-        /// <param name="handle">handle to An object</param>
-        /// <returns>handle to a Timer object or an uninitialized handle</returns>
-        internal static Timer DownCast(BaseHandle handle)
+        public static Timer DownCast(BaseHandle handle)
         {
             Timer ret = new Timer(NDalicPINVOKE.Timer_DownCast(BaseHandle.getCPtr(handle)), true);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
index db79869..290e426 100755 (executable)
-/** 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.
-*
-*/
-// This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts
-//------------------------------------------------------------------------------
-// <auto-generated />
-//
-// This file was automatically generated by SWIG (http://www.swig.org).
-// Version 3.0.9
-//
-// Do not make changes to this file unless you know what you are doing--modify
-// the SWIG interface file instead.
-//------------------------------------------------------------------------------
-
-using Tizen.NUI.BaseComponents;
-
-namespace Tizen.NUI.UIComponents
-{
-
-    /// <summary>
-    /// A PushButton changes its appearance when is pressed and returns to its original when is released.
-    /// </summary>
-    public class PushButton : Button
-    {
-        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-
-        internal PushButton(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.PushButton_SWIGUpcast(cPtr), cMemoryOwn)
-        {
-            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-        }
-
-        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(PushButton obj)
-        {
-            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-        }
-
-        /// <summary>
-        /// To make PushButton instance be disposed.
-        /// </summary>
-        protected override 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_PushButton(swigCPtr);
-                }
-                swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-            }
-
-            base.Dispose(type);
-        }
-
-
-        internal class Property
-        {
-            internal static readonly int UNSELECTED_ICON = NDalicPINVOKE.PushButton_Property_UNSELECTED_ICON_get();
-            internal static readonly int SELECTED_ICON = NDalicPINVOKE.PushButton_Property_SELECTED_ICON_get();
-            internal static readonly int ICON_ALIGNMENT = NDalicPINVOKE.PushButton_Property_ICON_ALIGNMENT_get();
-            internal static readonly int LABEL_PADDING = NDalicPINVOKE.PushButton_Property_LABEL_PADDING_get();
-            internal static readonly int ICON_PADDING = NDalicPINVOKE.PushButton_Property_ICON_PADDING_get();
-        }
-
-        /// <summary>
-        /// Creates the PushButton.
-        /// </summary>
-        public PushButton() : this(NDalicPINVOKE.PushButton_New(), true)
-        {
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-
-        }
-
+/** Copyright (c) 2017 Samsung Electronics Co., Ltd.\r
+*\r
+* Licensed under the Apache License, Version 2.0 (the "License");\r
+* you may not use this file except in compliance with the License.\r
+* You may obtain a copy of the License at\r
+*\r
+* http://www.apache.org/licenses/LICENSE-2.0\r
+*\r
+* Unless required by applicable law or agreed to in writing, software\r
+* distributed under the License is distributed on an "AS IS" BASIS,\r
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+* See the License for the specific language governing permissions and\r
+* limitations under the License.\r
+*\r
+*/\r
+// This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts\r
+//------------------------------------------------------------------------------\r
+// <auto-generated />\r
+//\r
+// This file was automatically generated by SWIG (http://www.swig.org).\r
+// Version 3.0.9\r
+//\r
+// Do not make changes to this file unless you know what you are doing--modify\r
+// the SWIG interface file instead.\r
+//------------------------------------------------------------------------------\r
+\r
+using Tizen.NUI.BaseComponents;\r
+\r
+namespace Tizen.NUI.UIComponents\r
+{\r
+\r
+    /// <summary>\r
+    /// A PushButton changes its appearance when is pressed and returns to its original when is released.\r
+    /// </summary>\r
+    public class PushButton : Button\r
+    {\r
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;\r
+\r
+        internal PushButton(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.PushButton_SWIGUpcast(cPtr), cMemoryOwn)\r
+        {\r
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);\r
+        }\r
+\r
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(PushButton obj)\r
+        {\r
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;\r
+        }\r
+\r
+        /// <summary>\r
+        /// To make PushButton instance be disposed.\r
+        /// </summary>\r
+        protected override void Dispose(DisposeTypes type)\r
+        {\r
+            if (disposed)\r
+            {\r
+                return;\r
+            }\r
+\r
+            if (type == DisposeTypes.Explicit)\r
+            {\r
+                //Called by User\r
+                //Release your own managed resources here.\r
+                //You should release all of your own disposable objects here.\r
+            }\r
+\r
+            //Release your own unmanaged resources here.\r
+            //You should not access any managed member here except static instance.\r
+            //because the execution order of Finalizes is non-deterministic.\r
+\r
+            if (swigCPtr.Handle != global::System.IntPtr.Zero)\r
+            {\r
+                if (swigCMemOwn)\r
+                {\r
+                    swigCMemOwn = false;\r
+                    NDalicPINVOKE.delete_PushButton(swigCPtr);\r
+                }\r
+                swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);\r
+            }\r
+\r
+            base.Dispose(type);\r
+        }\r
+\r
+\r
+        internal class Property\r
+        {\r
+            internal static readonly int UNSELECTED_ICON = NDalicPINVOKE.PushButton_Property_UNSELECTED_ICON_get();\r
+            internal static readonly int SELECTED_ICON = NDalicPINVOKE.PushButton_Property_SELECTED_ICON_get();\r
+            internal static readonly int ICON_ALIGNMENT = NDalicPINVOKE.PushButton_Property_ICON_ALIGNMENT_get();\r
+            internal static readonly int LABEL_PADDING = NDalicPINVOKE.PushButton_Property_LABEL_PADDING_get();\r
+            internal static readonly int ICON_PADDING = NDalicPINVOKE.PushButton_Property_ICON_PADDING_get();\r
+        }\r
+\r
+        /// <summary>\r
+        /// Creates the PushButton.\r
+        /// </summary>\r
+        public PushButton() : this(NDalicPINVOKE.PushButton_New(), true)\r
+        {\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+\r
+        }\r
+\r
         internal PushButton(PushButton pushButton) : this(NDalicPINVOKE.new_PushButton__SWIG_1(PushButton.getCPtr(pushButton)), true)\r
         {\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
@@ -111,14 +111,10 @@ namespace Tizen.NUI.UIComponents
             return ret;\r
         }\r
 \r
-        /// <summary>\r
-        /// Downcasts a handle to PushButton handle.<br>\r
-        /// If handle points to a PushButton, the downcast produces valid handle.<br>\r
-        /// If not the returned handle is left uninitialized.<br>\r
-        /// </summary>\r
-        /// <param name="handle">Handle to an object</param>\r
-        /// <returns>handle to a PushButton or an uninitialized handle</returns>\r
-        internal new static PushButton DownCast(BaseHandle handle)\r
+        /// <summary>
+        /// this method will be changed as internal method on later release
+        /// </summary>
+        public new static PushButton DownCast(BaseHandle handle)\r
         {\r
             PushButton ret = new PushButton(NDalicPINVOKE.PushButton_DownCast(BaseHandle.getCPtr(handle)), true);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
@@ -329,4 +325,4 @@ namespace Tizen.NUI.UIComponents
         }\r
 \r
     }\r
-}
+}\r
index 44a2fe0..0c1df3d 100755 (executable)
@@ -235,13 +235,9 @@ namespace Tizen.NUI.UIComponents
         }
 
         /// <summary>
-        /// Downcasts a handle to ScrollBar handle.<br>
-        /// If handle points to a ScrollBar, the downcast produces valid handle.<br>
-        /// If not, the returned handle is left uninitialized.<br>
+        /// this method will be changed as internal method on later release
         /// </summary>
-        /// <param name="handle">Handle to an object</param>
-        /// <returns>Handle to a ScrollBar or an uninitialized handle</returns>
-        internal new static ScrollBar DownCast(BaseHandle handle)
+        public new static ScrollBar DownCast(BaseHandle handle)
         {
             ScrollBar ret = new ScrollBar(NDalicPINVOKE.ScrollBar_DownCast(BaseHandle.getCPtr(handle)), true);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
index 2dfcba2..17213e4 100755 (executable)
@@ -857,7 +857,7 @@ namespace Tizen.NUI
         /// <summary>
         /// Touch event argument.
         /// </summary>
-        public class TouchedEventArgs : EventArgs
+        public class TouchEventArgs : EventArgs
         {
             private Touch _touch;
 
@@ -877,7 +877,7 @@ namespace Tizen.NUI
             }
         }
 
-        private event EventHandler<TouchedEventArgs> _stageTouchHandler;
+        private event EventHandler<TouchEventArgs> _stageTouchHandler;
         private EventCallbackDelegateType1 _stageTouchCallbackDelegate;
 
         /// <summary>
@@ -886,7 +886,7 @@ namespace Tizen.NUI
         /// then when the last finger is lifted.<br>
         /// An interrupted event will also be emitted (if it occurs).<br>
         /// </summary>
-        public event EventHandler<TouchedEventArgs> Touched
+        public event EventHandler<TouchEventArgs> Touch
         {
             add
             {
@@ -912,7 +912,7 @@ namespace Tizen.NUI
 
         private void OnStageTouch(IntPtr data)
         {
-            TouchedEventArgs e = new TouchedEventArgs();
+            TouchEventArgs e = new TouchEventArgs();
 
             if (data != null)
             {
@@ -928,7 +928,7 @@ namespace Tizen.NUI
         /// <summary>
         /// Wheel event arguments.
         /// </summary>
-        public class WheelRolledEventArgs : EventArgs
+        public class WheelEventArgs : EventArgs
         {
             private Wheel _wheel;
 
@@ -948,13 +948,13 @@ namespace Tizen.NUI
             }
         }
 
-        private event EventHandler<WheelRolledEventArgs> _stageWheelHandler;
+        private event EventHandler<WheelEventArgs> _stageWheelHandler;
         private EventCallbackDelegateType1 _stageWheelCallbackDelegate;
 
         /// <summary>
         /// Event emitted when wheel event is received.
         /// </summary>
-        public event EventHandler<WheelRolledEventArgs> WheelRolled
+        public event EventHandler<WheelEventArgs> WheelRoll
         {
             add
             {
@@ -977,7 +977,7 @@ namespace Tizen.NUI
 
         private void OnStageWheel(IntPtr data)
         {
-            WheelRolledEventArgs e = new WheelRolledEventArgs();
+            WheelEventArgs e = new WheelEventArgs();
 
             if (data != null)
             {
@@ -1019,7 +1019,7 @@ namespace Tizen.NUI
         /// <summary>
         /// Event emitted when key event is received.
         /// </summary>
-        public event EventHandler<KeyEventArgs> KeyPressed
+        public event EventHandler<KeyEventArgs> Key
         {
             add
             {
@@ -1392,16 +1392,22 @@ namespace Tizen.NUI
                 }
             }
         }\r
-\r
         /// <summary>\r
         /// will be deprecated at nui_0.2.50\r
         /// </summary>\r
-        /// <param name="layer"></param>\r
         public void AddLayer(Layer layer)\r
         {\r
             NDalicPINVOKE.Stage_Add(stageCPtr, Layer.getCPtr(layer));\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
+        /// <summary>\r
+        /// will be deprecated at nui_0.2.50\r
+        /// </summary>\r
+        public void RemoveLayer(Layer layer)\r
+        {\r
+            NDalicPINVOKE.Stage_Remove(stageCPtr, Layer.getCPtr(layer));\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
 \r
         /*********************************************************************************/\r
         /*** will be removed/deprecated                                                  ***/\r