AnimationBetween() parameter changed and more
authordongsug.song <dongsug.song@samsung.com>
Tue, 7 Mar 2017 05:28:25 +0000 (14:28 +0900)
committerdongsug.song <dongsug.song@samsung.com>
Wed, 8 Mar 2017 00:22:39 +0000 (09:22 +0900)
 - resolve crash issue : http://suprem.sec.samsung.net/jira/browse/NUI-66 crash
 - event handler pattern changed
 - Visibility property in Actor.cs is removed
 - NUIApplication class is changed to public class, hello-test.cs is sample app
 - FlexContainer's child property in View.cs gets some comments
 - nui second minor version up (form 1.0.0 to 1.0.1)
 - some useless files are removed

Signed-off-by: dongsug.song <dongsug.song@samsung.com>
Change-Id: I6e3392f98b8397ace49252e966fdfb8ec663b1ec

13 files changed:
packaging/csapi-nui.spec
src/Tizen.NUI/Tizen.NUI.csproj.user [deleted file]
src/Tizen.NUI/src/internal/Application.cs
src/Tizen.NUI/src/public/Actor.cs
src/Tizen.NUI/src/public/Animation.cs
src/Tizen.NUI/src/public/Button.cs
src/Tizen.NUI/src/public/FlexContainer.cs
src/Tizen.NUI/src/public/FocusManager.cs
src/Tizen.NUI/src/public/NUIApplication.cs
src/Tizen.NUI/src/public/Popup.cs
src/Tizen.NUI/src/public/Stage.cs
src/Tizen.NUI/src/public/Timer.cs
src/Tizen.NUI/src/public/View.cs

index e9e013f..f2af8c7 100755 (executable)
@@ -1,6 +1,6 @@
 Name:       csapi-nui
 Summary:    dali-NUI
-Version:    1.0.0
+Version:    1.0.1
 Release:    0
 Group:      Development/Libraries
 License:    Apache-2.0
diff --git a/src/Tizen.NUI/Tizen.NUI.csproj.user b/src/Tizen.NUI/Tizen.NUI.csproj.user
deleted file mode 100755 (executable)
index e482657..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <ProjectView>ShowAllFiles</ProjectView>\r
-  </PropertyGroup>\r
-</Project>
\ No newline at end of file
index c52adaf..c616ded 100755 (executable)
@@ -1,19 +1,19 @@
-//------------------------------------------------------------------------------
-// <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.
-//------------------------------------------------------------------------------
-
+//------------------------------------------------------------------------------\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
 namespace Tizen.NUI\r
-{
-
-    using System;
-    using System.Runtime.InteropServices;
-
+{\r
+\r
+    using System;\r
+    using System.Runtime.InteropServices;\r
+\r
     internal class LOG\r
     {\r
         internal LOG(string _str)\r
@@ -22,17 +22,17 @@ namespace Tizen.NUI
         }\r
     }\r
 \r
-    /**
-      * @brief Event arguments that passed via NUIApplicationInit signal
-      *
-      */
-    public class NUIApplicationInitEventArgs : EventArgs
+    /**\r
+      * @brief Event arguments that passed via NUIApplicationInit signal\r
+      *\r
+      */\r
+    internal class NUIApplicationInitEventArgs : EventArgs\r
     {\r
         private Application _application;\r
 \r
-        /**
-          * @brief Application - is the application that is being initialized
-          *
+        /**\r
+          * @brief Application - is the application that is being initialized\r
+          *\r
           */\r
         public Application Application\r
         {\r
@@ -44,19 +44,19 @@ namespace Tizen.NUI
             {\r
                 _application = value;\r
             }\r
-        }
-    }
-
-    /**
-      * @brief Event arguments that passed via NUIApplicationTerminate signal
-      *
-      */
-    public class NUIApplicationTerminateEventArgs : EventArgs
+        }\r
+    }\r
+\r
+    /**\r
+      * @brief Event arguments that passed via NUIApplicationTerminate signal\r
+      *\r
+      */\r
+    internal class NUIApplicationTerminateEventArgs : EventArgs\r
     {\r
         private Application _application;\r
-        /**
-          * @brief Application - is the application that is being Terminated
-          *
+        /**\r
+          * @brief Application - is the application that is being Terminated\r
+          *\r
           */\r
         public Application Application\r
         {\r
@@ -68,19 +68,19 @@ namespace Tizen.NUI
             {\r
                 _application = value;\r
             }\r
-        }
-    }
-
-    /**
-      * @brief Event arguments that passed via NUIApplicationPause signal
-      *
-      */
-    public class NUIApplicationPauseEventArgs : EventArgs
+        }\r
+    }\r
+\r
+    /**\r
+      * @brief Event arguments that passed via NUIApplicationPause signal\r
+      *\r
+      */\r
+    internal class NUIApplicationPauseEventArgs : EventArgs\r
     {\r
         private Application _application;\r
-        /**
-          * @brief Application - is the application that is being Paused
-          *
+        /**\r
+          * @brief Application - is the application that is being Paused\r
+          *\r
           */\r
         public Application Application\r
         {\r
@@ -92,19 +92,19 @@ namespace Tizen.NUI
             {\r
                 _application = value;\r
             }\r
-        }
-    }
-
-    /**
-      * @brief Event arguments that passed via NUIApplicationResume signal
-      *
-      */
-    public class NUIApplicationResumeEventArgs : EventArgs
+        }\r
+    }\r
+\r
+    /**\r
+      * @brief Event arguments that passed via NUIApplicationResume signal\r
+      *\r
+      */\r
+    internal class NUIApplicationResumeEventArgs : EventArgs\r
     {\r
         private Application _application;\r
-        /**
-          * @brief Application - is the application that is being Resumed
-          *
+        /**\r
+          * @brief Application - is the application that is being Resumed\r
+          *\r
           */\r
         public Application Application\r
         {\r
@@ -116,19 +116,19 @@ namespace Tizen.NUI
             {\r
                 _application = value;\r
             }\r
-        }
-    }
-
-    /**
-      * @brief Event arguments that passed via NUIApplicationReset signal
-      *
-      */
-    public class NUIApplicationResetEventArgs : EventArgs
+        }\r
+    }\r
+\r
+    /**\r
+      * @brief Event arguments that passed via NUIApplicationReset signal\r
+      *\r
+      */\r
+    internal class NUIApplicationResetEventArgs : EventArgs\r
     {\r
         private Application _application;\r
-        /**
-          * @brief Application - is the application that is being Reset
-          *
+        /**\r
+          * @brief Application - is the application that is being Reset\r
+          *\r
           */\r
         public Application Application\r
         {\r
@@ -140,19 +140,19 @@ namespace Tizen.NUI
             {\r
                 _application = value;\r
             }\r
-        }
-    }
-
-    /**
-      * @brief Event arguments that passed via NUIApplicationResize signal
-      *
-      */
-    public class NUIApplicationResizeEventArgs : EventArgs
+        }\r
+    }\r
+\r
+    /**\r
+      * @brief Event arguments that passed via NUIApplicationResize signal\r
+      *\r
+      */\r
+    internal class NUIApplicationResizeEventArgs : EventArgs\r
     {\r
         private Application _application;\r
-        /**
-          * @brief Application - is the application that is being Resized
-          *
+        /**\r
+          * @brief Application - is the application that is being Resized\r
+          *\r
           */\r
         public Application Application\r
         {\r
@@ -164,19 +164,19 @@ namespace Tizen.NUI
             {\r
                 _application = value;\r
             }\r
-        }
-    }
-
-    /**
-      * @brief Event arguments that passed via NUIApplicationLanguageChanged signal
-      *
-      */
-    public class NUIApplicationLanguageChangedEventArgs : EventArgs
+        }\r
+    }\r
+\r
+    /**\r
+      * @brief Event arguments that passed via NUIApplicationLanguageChanged signal\r
+      *\r
+      */\r
+    internal class NUIApplicationLanguageChangedEventArgs : EventArgs\r
     {\r
         private Application _application;\r
-        /**
-          * @brief Application - is the application that is being affected with Device's language change
-          *
+        /**\r
+          * @brief Application - is the application that is being affected with Device's language change\r
+          *\r
           */\r
         public Application Application\r
         {\r
@@ -188,19 +188,19 @@ namespace Tizen.NUI
             {\r
                 _application = value;\r
             }\r
-        }
-    }
-
-    /**
-      * @brief Event arguments that passed via NUIApplicationRegionChanged signal
-      *
-      */
-    public class NUIApplicationRegionChangedEventArgs : EventArgs
+        }\r
+    }\r
+\r
+    /**\r
+      * @brief Event arguments that passed via NUIApplicationRegionChanged signal\r
+      *\r
+      */\r
+    internal class NUIApplicationRegionChangedEventArgs : EventArgs\r
     {\r
         private Application _application;\r
-        /**
-          * @brief Application - is the application that is being affected with Device's region change
-          *
+        /**\r
+          * @brief Application - is the application that is being affected with Device's region change\r
+          *\r
           */\r
         public Application Application\r
         {\r
@@ -212,19 +212,19 @@ namespace Tizen.NUI
             {\r
                 _application = value;\r
             }\r
-        }
-    }
-
-    /**
-      * @brief Event arguments that passed via NUIApplicationBatteryLow signal
-      *
-      */
-    public class NUIApplicationBatteryLowEventArgs : EventArgs
+        }\r
+    }\r
+\r
+    /**\r
+      * @brief Event arguments that passed via NUIApplicationBatteryLow signal\r
+      *\r
+      */\r
+    internal class NUIApplicationBatteryLowEventArgs : EventArgs\r
     {\r
         private Application _application;\r
-        /**
-          * @brief Application - is the application that is being affected when the battery level of the device is low
-          *
+        /**\r
+          * @brief Application - is the application that is being affected when the battery level of the device is low\r
+          *\r
           */\r
         public Application Application\r
         {\r
@@ -236,19 +236,19 @@ namespace Tizen.NUI
             {\r
                 _application = value;\r
             }\r
-        }
-    }
-
-    /**
-      * @brief Event arguments that passed via NUIApplicationMemoryLow signal
-      *
-      */
-    public class NUIApplicationMemoryLowEventArgs : EventArgs
+        }\r
+    }\r
+\r
+    /**\r
+      * @brief Event arguments that passed via NUIApplicationMemoryLow signal\r
+      *\r
+      */\r
+    internal class NUIApplicationMemoryLowEventArgs : EventArgs\r
     {\r
         private Application _application;\r
-        /**
-          * @brief Application - is the application that is being affected when the memory level of the device is low
-          *
+        /**\r
+          * @brief Application - is the application that is being affected when the memory level of the device is low\r
+          *\r
           */\r
         public Application Application\r
         {\r
@@ -260,20 +260,20 @@ namespace Tizen.NUI
             {\r
                 _application = value;\r
             }\r
-        }
-    }
-
-    /**
-      * @brief Event arguments that passed via NUIApplicationAppControl         signal
-      *
-      */
-    public class NUIApplicationAppControlEventArgs : EventArgs
+        }\r
+    }\r
+\r
+    /**\r
+      * @brief Event arguments that passed via NUIApplicationAppControl         signal\r
+      *\r
+      */\r
+    internal class NUIApplicationAppControlEventArgs : EventArgs\r
     {\r
         private Application _application;\r
         private IntPtr _voidp;\r
-        /**
-          * @brief Application - is the application that is receiving the launch request from another application
-          *
+        /**\r
+          * @brief Application - is the application that is receiving the launch request from another application\r
+          *\r
           */\r
         public Application Application\r
         {\r
@@ -286,9 +286,9 @@ namespace Tizen.NUI
                 _application = value;\r
             }\r
         }\r
-        /**
-          * @brief VoidP - contains the information about why the application is launched
-          *
+        /**\r
+          * @brief VoidP - contains the information about why the application is launched\r
+          *\r
           */\r
         public IntPtr VoidP\r
         {\r
@@ -300,10 +300,10 @@ namespace Tizen.NUI
             {\r
                 _voidp = value;\r
             }\r
-        }
+        }\r
     }\r
 \r
-    public class Application : BaseHandle\r
+    internal class Application : BaseHandle\r
     {\r
         private global::System.Runtime.InteropServices.HandleRef swigCPtr;\r
 \r
@@ -405,10 +405,10 @@ namespace Tizen.NUI
         private DaliEventHandler<object, NUIApplicationAppControlEventArgs> _applicationAppControlEventHandler;\r
         private NUIApplicationAppControlEventCallbackDelegate _applicationAppControlEventCallbackDelegate;\r
 \r
-        /**
-          * @brief Event for Initialized signal which can be used to subscribe/unsubscribe the event handler
-          * (in the type of NUIApplicationInitEventHandler - DaliEventHandler<object,NUIApplicationInitEventArgs>)
-          *  provided by the user. Initialized signal is emitted when application is initialised
+        /**\r
+          * @brief Event for Initialized signal which can be used to subscribe/unsubscribe the event handler\r
+          * (in the type of NUIApplicationInitEventHandler - DaliEventHandler<object,NUIApplicationInitEventArgs>)\r
+          *  provided by the user. Initialized signal is emitted when application is initialised\r
           */\r
         public event DaliEventHandler<object, NUIApplicationInitEventArgs> Initialized\r
         {\r
@@ -456,10 +456,10 @@ namespace Tizen.NUI
             }\r
         }\r
 \r
-        /**
-          * @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 terminated
+        /**\r
+          * @brief Event for Terminated signal which can be used to subscribe/unsubscribe the event handler\r
+          * (in the type of NUIApplicationTerminateEventHandler-DaliEventHandler<object,NUIApplicationTerminateEventArgs>)\r
+          *  provided by the user. Terminated signal is emitted when application is terminated\r
           */\r
         public event DaliEventHandler<object, NUIApplicationTerminateEventArgs> Terminated\r
         {\r
@@ -507,10 +507,10 @@ namespace Tizen.NUI
             }\r
         }\r
 \r
-        /**
-          * @brief Event for Paused signal which can be used to subscribe/unsubscribe the event handler
-          * (in the type of NUIApplicationPauseEventHandler-DaliEventHandler<object,NUIApplicationPauseEventArgs>)
-          * provided by the user. Paused signal is emitted when application is paused
+        /**\r
+          * @brief Event for Paused signal which can be used to subscribe/unsubscribe the event handler\r
+          * (in the type of NUIApplicationPauseEventHandler-DaliEventHandler<object,NUIApplicationPauseEventArgs>)\r
+          * provided by the user. Paused signal is emitted when application is paused\r
           */\r
         public event DaliEventHandler<object, NUIApplicationPauseEventArgs> Paused\r
         {\r
@@ -558,10 +558,10 @@ namespace Tizen.NUI
             }\r
         }\r
 \r
-        /**
-          * @brief Event for Resumed signal which can be used to subscribe/unsubscribe the event handler
-          * (in the type of NUIApplicationResumeEventHandler-DaliEventHandler<object,NUIApplicationResumeEventArgs>)
-          *  provided by the user. Resumed signal is emitted when application is resumed
+        /**\r
+          * @brief Event for Resumed signal which can be used to subscribe/unsubscribe the event handler\r
+          * (in the type of NUIApplicationResumeEventHandler-DaliEventHandler<object,NUIApplicationResumeEventArgs>)\r
+          *  provided by the user. Resumed signal is emitted when application is resumed\r
           */\r
         public event DaliEventHandler<object, NUIApplicationResumeEventArgs> Resumed\r
         {\r
@@ -609,10 +609,10 @@ namespace Tizen.NUI
             }\r
         }\r
 \r
-        /**
-          * @brief Event for Reset signal which can be used to subscribe/unsubscribe the event handler
-          * (in the type of NUIApplicationResetEventHandler-DaliEventHandler<object,NUIApplicationResetEventArgs>)
-          *  provided by the user. Reset signal is emitted when application is reset
+        /**\r
+          * @brief Event for Reset signal which can be used to subscribe/unsubscribe the event handler\r
+          * (in the type of NUIApplicationResetEventHandler-DaliEventHandler<object,NUIApplicationResetEventArgs>)\r
+          *  provided by the user. Reset signal is emitted when application is reset\r
           */\r
         public event DaliEventHandler<object, NUIApplicationResetEventArgs> Reset\r
         {\r
@@ -660,10 +660,10 @@ namespace Tizen.NUI
             }\r
         }\r
 \r
-        /**
-          * @brief Event for Resized signal which can be used to subscribe/unsubscribe the event handler
-          * (in the type of NUIApplicationResizeEventHandler-DaliEventHandler<object,NUIApplicationResizeEventArgs>)
-          *  provided by the user. Resized signal is emitted when application is resized
+        /**\r
+          * @brief Event for Resized signal which can be used to subscribe/unsubscribe the event handler\r
+          * (in the type of NUIApplicationResizeEventHandler-DaliEventHandler<object,NUIApplicationResizeEventArgs>)\r
+          *  provided by the user. Resized signal is emitted when application is resized\r
           */\r
         public event DaliEventHandler<object, NUIApplicationResizeEventArgs> Resized\r
         {\r
@@ -711,10 +711,10 @@ namespace Tizen.NUI
             }\r
         }\r
 \r
-        /**
-          * @brief Event for LanguageChanged signal which can be used to subscribe/unsubscribe the event handler
-          * (in the type of NUIApplicationLanguageChangedEventHandler-DaliEventHandler<object,NUIApplicationLanguageChangedEventArgs>)
-          *  provided by the user. LanguageChanged signal is emitted when the region of the device is changed.
+        /**\r
+          * @brief Event for LanguageChanged signal which can be used to subscribe/unsubscribe the event handler\r
+          * (in the type of NUIApplicationLanguageChangedEventHandler-DaliEventHandler<object,NUIApplicationLanguageChangedEventArgs>)\r
+          *  provided by the user. LanguageChanged signal is emitted when the region of the device is changed.\r
           */\r
         public event DaliEventHandler<object, NUIApplicationLanguageChangedEventArgs> LanguageChanged\r
         {\r
@@ -762,10 +762,10 @@ namespace Tizen.NUI
             }\r
         }\r
 \r
-        /**
-          * @brief Event for RegionChanged signal which can be used to subscribe/unsubscribe the event handler
-          * (in the type of NUIApplicationRegionChangedEventHandler-DaliEventHandler<object,NUIApplicationRegionChangedEventArgs>)
-          *  provided by the user. RegionChanged signal is emitted when the region of the device is changed.
+        /**\r
+          * @brief Event for RegionChanged signal which can be used to subscribe/unsubscribe the event handler\r
+          * (in the type of NUIApplicationRegionChangedEventHandler-DaliEventHandler<object,NUIApplicationRegionChangedEventArgs>)\r
+          *  provided by the user. RegionChanged signal is emitted when the region of the device is changed.\r
           */\r
         public event DaliEventHandler<object, NUIApplicationRegionChangedEventArgs> RegionChanged\r
         {\r
@@ -813,10 +813,10 @@ namespace Tizen.NUI
             }\r
         }\r
 \r
-        /**
-          * @brief Event for BatteryLow signal which can be used to subscribe/unsubscribe the event handler
-          * (in the type of NUIApplicationBatteryLowEventHandler-DaliEventHandler<object,NUIApplicationBatteryLowEventArgs>) 
-          * provided by the user. BatteryLow signal is emitted when the battery level of the device is low.
+        /**\r
+          * @brief Event for BatteryLow signal which can be used to subscribe/unsubscribe the event handler\r
+          * (in the type of NUIApplicationBatteryLowEventHandler-DaliEventHandler<object,NUIApplicationBatteryLowEventArgs>) \r
+          * provided by the user. BatteryLow signal is emitted when the battery level of the device is low.\r
           */\r
         public event DaliEventHandler<object, NUIApplicationBatteryLowEventArgs> BatteryLow\r
         {\r
@@ -864,10 +864,10 @@ namespace Tizen.NUI
             }\r
         }\r
 \r
-        /**
-          * @brief Event for MemoryLow signal which can be used to subscribe/unsubscribe the event handler
-          * (in the type of NUIApplicationMemoryLowEventHandler-DaliEventHandler<object,NUIApplicationMemoryLowEventArgs>)
-          *  provided by the user. MemoryLow signal is emitted when the memory level of the device is low.
+        /**\r
+          * @brief Event for MemoryLow signal which can be used to subscribe/unsubscribe the event handler\r
+          * (in the type of NUIApplicationMemoryLowEventHandler-DaliEventHandler<object,NUIApplicationMemoryLowEventArgs>)\r
+          *  provided by the user. MemoryLow signal is emitted when the memory level of the device is low.\r
           */\r
         public event DaliEventHandler<object, NUIApplicationMemoryLowEventArgs> MemoryLow\r
         {\r
@@ -915,10 +915,10 @@ namespace Tizen.NUI
             }\r
         }\r
 \r
-        /**
-          * @brief Event for AppControl signal which can be used to subscribe/unsubscribe the event handler
-          * (in the type of NUIApplicationAppControlEventHandler-DaliEventHandler<object,NUIApplicationAppControlEventArgs>)
-          *  provided by the user. AppControl signal is emitted when another application sends a launch request to the application.
+        /**\r
+          * @brief Event for AppControl signal which can be used to subscribe/unsubscribe the event handler\r
+          * (in the type of NUIApplicationAppControlEventHandler-DaliEventHandler<object,NUIApplicationAppControlEventArgs>)\r
+          *  provided by the user. AppControl signal is emitted when another application sends a launch request to the application.\r
           */\r
         public event DaliEventHandler<object, NUIApplicationAppControlEventArgs> AppControl\r
         {\r
@@ -1090,8 +1090,8 @@ namespace Tizen.NUI
 \r
 \r
 \r
-        /**
-        * Outer::outer_method(int)
+        /**\r
+        * Outer::outer_method(int)\r
         */\r
         public static Application New()\r
         {\r
@@ -1308,6 +1308,6 @@ namespace Tizen.NUI
             Transparent = 1\r
         }\r
 \r
-    }
-
-}
+    }\r
+\r
+}\r
index 1f47787..04ae4f1 100755 (executable)
@@ -100,14 +100,6 @@ namespace Tizen.NUI
             }\r
         }\r
 \r
-        public bool Visibility\r
-        {\r
-            get\r
-            {\r
-                return IsVisible();\r
-            }\r
-        }\r
-\r
         public float Opacity\r
         {\r
             get\r
index fdcfe52..a626665 100755 (executable)
@@ -80,11 +80,6 @@ namespace Tizen.NUI
 \r
 \r
 \r
-        private AnimationFinishedEventCallbackType _animationFinishedEventCallback;\r
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]\r
-        private delegate void AnimationFinishedEventCallbackType(IntPtr data);\r
-        private event EventHandler _animationFinishedEventHandler;\r
-\r
         /**\r
         * @brief Create an initialized Animation.\r
         *\r
@@ -101,6 +96,10 @@ namespace Tizen.NUI
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
 \r
+        private AnimationFinishedEventCallbackType _animationFinishedEventCallback;\r
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]\r
+        private delegate void AnimationFinishedEventCallbackType(IntPtr data);\r
+        private event EventHandler _animationFinishedEventHandler;\r
         /**\r
         * @brief Event for Finished signal which can be used to subscribe/unsubscribe the event handler\r
         * Finished signal is emitted when an Animation's animations have finished.\r
@@ -119,12 +118,12 @@ namespace Tizen.NUI
             }\r
             remove\r
             {\r
-                if (_animationFinishedEventHandler != null)\r
+                _animationFinishedEventHandler -= value;\r
+\r
+                if (_animationFinishedEventHandler == null && _animationFinishedEventCallback != null)\r
                 {\r
                     FinishedSignal().Disconnect(_animationFinishedEventCallback);\r
                 }\r
-\r
-                _animationFinishedEventHandler -= value;\r
             }\r
         }\r
         private void OnFinished(IntPtr data)\r
@@ -401,7 +400,7 @@ namespace Tizen.NUI
             }\r
         }\r
 \r
-        public void AnimateBetween(Actor target, string property, KeyFrames keyFrames, AlphaFunction alphaFunction = null)\r
+        public void AnimateBetween(Actor target, string property, KeyFrames keyFrames, Interpolation interpolation = Interpolation.Linear, AlphaFunction alphaFunction = null)\r
         {\r
             string _str1 = property.Substring(0, 1);\r
             string _str2 = property.Substring(1);\r
@@ -415,12 +414,11 @@ namespace Tizen.NUI
 \r
             if (alphaFunction != null)\r
             {\r
-\r
-                AnimateBetween(_prop, keyFrames);\r
+                AnimateBetween(_prop, keyFrames, alphaFunction, interpolation);\r
             }\r
             else\r
             {\r
-                AnimateBetween(_prop, keyFrames, alphaFunction);\r
+                AnimateBetween(_prop, keyFrames, interpolation);\r
             }\r
         }\r
 \r
index 4378eba..5523fd8 100755 (executable)
 // 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
 // Some have been manually changed\r
 \r
@@ -100,12 +100,12 @@ namespace Tizen.NUI
 \r
             remove\r
             {\r
-                if (_clickedEventHandler != null)\r
+                _clickedEventHandler -= value;\r
+\r
+                if (_clickedEventHandler == null && _clickedCallback != null)\r
                 {\r
                     ClickedSignal().Disconnect(_clickedCallback);\r
                 }\r
-\r
-                _clickedEventHandler -= value;\r
             }\r
         }\r
 \r
@@ -141,12 +141,12 @@ namespace Tizen.NUI
 \r
             remove\r
             {\r
-                if (_pressedEventHandler != null)\r
+                _pressedEventHandler -= value;\r
+\r
+                if (_pressedEventHandler == null && _pressedCallback != null)\r
                 {\r
                     this.PressedSignal().Disconnect(_pressedCallback);\r
                 }\r
-\r
-                _pressedEventHandler -= value;\r
             }\r
         }\r
 \r
@@ -175,21 +175,18 @@ namespace Tizen.NUI
                     _releasedCallback = OnReleased;\r
                     ReleasedSignal().Connect(_releasedCallback);\r
                 }\r
-\r
                 _releasedEventHandler += value;\r
             }\r
 \r
             remove\r
             {\r
-                lock (this)\r
-                {\r
-                    if (_releasedEventHandler != null)\r
-                    {\r
-                        ReleasedSignal().Disconnect(_releasedCallback);\r
-                    }\r
+                _releasedEventHandler -= value;\r
 \r
-                    _releasedEventHandler -= value;\r
+                if (_releasedEventHandler == null && _releasedCallback != null)\r
+                {\r
+                    ReleasedSignal().Disconnect(_releasedCallback);\r
                 }\r
+\r
             }\r
         }\r
 \r
@@ -223,12 +220,12 @@ namespace Tizen.NUI
 \r
             remove\r
             {\r
-                if (_stateChangedEventHandler != null)\r
+                _stateChangedEventHandler -= value;\r
+\r
+                if (_stateChangedEventHandler == null && _stateChangedCallback != null)\r
                 {\r
                     StateChangedSignal().Disconnect(_stateChangedCallback);\r
                 }\r
-\r
-                _stateChangedEventHandler -= value;\r
             }\r
         }\r
 \r
@@ -791,6 +788,6 @@ namespace Tizen.NUI
             }\r
         }\r
 \r
-    }
-
+    }\r
+\r
 }
\ No newline at end of file
index 9359885..9628ef2 100755 (executable)
@@ -201,6 +201,10 @@ namespace Tizen.NUI
             return ret;
         }
 
+        /// <summary>
+        /// Enumeration for the direction of the main axis in the flex container. This determines
+        /// the direction that flex items are laid out in the flex container.
+        /// </summary>
         public enum FlexDirectionType
         {
             Column,
@@ -216,6 +220,10 @@ namespace Tizen.NUI
             RTL
         }
 
+        /// <summary>
+        /// Enumeration for the alignment of the flex items when the items do not use all available
+        /// space on the main-axis.
+        /// </summary>
         public enum Justification
         {
             JustifyFlexStart,
@@ -225,6 +233,10 @@ namespace Tizen.NUI
             JustifySpaceAround
         }
 
+        /// <summary>
+        /// Enumeration for the alignment of the flex items or lines when the items or lines do not
+        /// use all the available space on the cross-axis.
+        /// </summary>
         public enum Alignment
         {
             AlignAuto,
@@ -233,6 +245,11 @@ namespace Tizen.NUI
             AlignFlexEnd,
             AlignStretch
         }
+
+        /// <summary>
+        /// Enumeration for the wrap type of the flex container when there is no enough room for
+        /// all the items on one flex line.
+        /// </summary>
         public enum WrapType
         {
             NoWrap,
@@ -247,82 +264,105 @@ namespace Tizen.NUI
             CHILD_PROPERTY_END_INDEX = PropertyRanges.CHILD_PROPERTY_REGISTRATION_START_INDEX + 1000
         }
 
-        public int ContentDirection
+        /// <summary>
+        /// The primary direction in which content is ordered
+        /// </summary>
+        public ContentDirectionType ContentDirection
         {
             get
             {
                 int temp = 0;
                 GetProperty(FlexContainer.Property.CONTENT_DIRECTION).Get(ref temp);
-                return temp;
+                return (ContentDirectionType)temp;
             }
             set
             {
-                SetProperty(FlexContainer.Property.CONTENT_DIRECTION, new Tizen.NUI.PropertyValue(value));
+                SetProperty(FlexContainer.Property.CONTENT_DIRECTION, new Tizen.NUI.PropertyValue((int)value));
             }
         }
-        public int FlexDirection
+
+        /// <summary>
+        /// The direction of the main-axis which determines the direction that flex items are laid out
+        /// </summary>
+        public FlexDirectionType FlexDirection
         {
             get
             {
                 int temp = 0;
                 GetProperty(FlexContainer.Property.FLEX_DIRECTION).Get(ref temp);
-                return temp;
+                return (FlexDirectionType)temp;
             }
             set
             {
-                SetProperty(FlexContainer.Property.FLEX_DIRECTION, new Tizen.NUI.PropertyValue(value));
+                SetProperty(FlexContainer.Property.FLEX_DIRECTION, new Tizen.NUI.PropertyValue((int)value));
             }
         }
-        public int FlexWrap
+
+        /// <summary>
+        /// Whether the flex items should wrap or not if there is no enough room for them on one flex line
+        /// </summary>
+        public WrapType FlexWrap
         {
             get
             {
                 int temp = 0;
                 GetProperty(FlexContainer.Property.FLEX_WRAP).Get(ref temp);
-                return temp;
+                return (WrapType)temp;
             }
             set
             {
-                SetProperty(FlexContainer.Property.FLEX_WRAP, new Tizen.NUI.PropertyValue(value));
+                SetProperty(FlexContainer.Property.FLEX_WRAP, new Tizen.NUI.PropertyValue((int)value));
             }
         }
-        public int JustifyContent
+
+        /// <summary>
+        /// The alignment of flex items when the items do not use all available space on the main-axis
+        /// </summary>
+        public Justification JustifyContent
         {
             get
             {
                 int temp = 0;
                 GetProperty(FlexContainer.Property.JUSTIFY_CONTENT).Get(ref temp);
-                return temp;
+                return (Justification)temp;
             }
             set
             {
-                SetProperty(FlexContainer.Property.JUSTIFY_CONTENT, new Tizen.NUI.PropertyValue(value));
+                SetProperty(FlexContainer.Property.JUSTIFY_CONTENT, new Tizen.NUI.PropertyValue((int)value));
             }
         }
-        public int AlignItems
+
+        /// <summary>
+        /// The alignment of flex items when the items do not use all available space on the cross-axis
+        /// </summary>
+        public Alignment AlignItems
         {
             get
             {
                 int temp = 0;
                 GetProperty(FlexContainer.Property.ALIGN_ITEMS).Get(ref temp);
-                return temp;
+                return (Alignment)temp;
             }
             set
             {
-                SetProperty(FlexContainer.Property.ALIGN_ITEMS, new Tizen.NUI.PropertyValue(value));
+                SetProperty(FlexContainer.Property.ALIGN_ITEMS, new Tizen.NUI.PropertyValue((int)value));
             }
         }
-        public int AlignContent
+
+        /// <summary>
+        /// Similar to "alignItems", but it aligns flex lines, so only works when there are multiple lines
+        /// </summary>
+        public Alignment AlignContent
         {
             get
             {
                 int temp = 0;
                 GetProperty(FlexContainer.Property.ALIGN_CONTENT).Get(ref temp);
-                return temp;
+                return (Alignment)temp;
             }
             set
             {
-                SetProperty(FlexContainer.Property.ALIGN_CONTENT, new Tizen.NUI.PropertyValue(value));
+                SetProperty(FlexContainer.Property.ALIGN_CONTENT, new Tizen.NUI.PropertyValue((int)value));
             }
         }
 
index 4124bab..bea570a 100755 (executable)
@@ -145,11 +145,11 @@ namespace Tizen.NUI
             }\r
             remove\r
             {\r
-                if (_preFocusChangeEventHandler != null)\r
+                _preFocusChangeEventHandler -= value;\r
+                if (_preFocusChangeEventHandler == null && _preFocusChangeCallback != null)\r
                 {\r
                     PreFocusChangeSignal().Disconnect(_preFocusChangeCallback);\r
                 }\r
-                _preFocusChangeEventHandler -= value;\r
             }\r
         }\r
 \r
@@ -222,11 +222,12 @@ namespace Tizen.NUI
             }\r
             remove\r
             {\r
-                if (_focusChangedEventCallback != null)\r
+                _focusChangedEventHandler -= value;\r
+\r
+                if (_focusChangedEventCallback == null && _focusChangedEventCallback != null)\r
                 {\r
                     FocusChangedSignal().Disconnect(_focusChangedEventCallback);\r
                 }\r
-                _focusChangedEventHandler -= value;\r
             }\r
         }\r
 \r
@@ -296,11 +297,12 @@ namespace Tizen.NUI
             }\r
             remove\r
             {\r
-                if (_focusGroupChangedEventCallback != null)\r
+                _focusGroupChangedEventHandler -= value;\r
+\r
+                if (_focusGroupChangedEventCallback == null && _focusGroupChangedEventCallback != null)\r
                 {\r
                     FocusGroupChangedSignal().Disconnect(_focusGroupChangedEventCallback);\r
                 }\r
-                _focusGroupChangedEventHandler -= value;\r
             }\r
         }\r
 \r
@@ -357,11 +359,12 @@ namespace Tizen.NUI
             }\r
             remove\r
             {\r
-                if (_focusedViewEnterKeyEventCallback != null)\r
+                _focusedViewEnterKeyEventHandler -= value;\r
+\r
+                if (_focusedViewEnterKeyEventCallback == null && _focusedViewEnterKeyEventCallback != null)\r
                 {\r
                     FocusedActorEnterKeySignal().Disconnect(_focusedViewEnterKeyEventCallback);\r
                 }\r
-                _focusedViewEnterKeyEventHandler -= value;\r
             }\r
         }\r
 \r
index 6ba6408..bdc1679 100755 (executable)
@@ -22,26 +22,61 @@ using Tizen.NUI;
 namespace Tizen.NUI
 {
 
+    /// <summary>
+    /// Represents an application that have UI screen. The NUIApplication class has a default stage.
+    /// </summary>
     public class NUIApplication : CoreUIApplication
     {
         private void LOG(string _str)
         {
-            Tizen.Log.Debug("NUI", _str);
+            //Tizen.Log.Debug("NUI", _str);
             //Console.WriteLine("[NUI]" + _str);
         }
 
+        /// <summary>
+        /// The instance of the Application.
+        /// </summary>
+        /// <remarks>
+        /// This application is created before OnCreate() or created event. And the NUIApplication will be terminated when this application is closed.
+        /// </remarks>
         private Application _application;
+
+        /// <summary>
+        /// The instance of the Dali Application extension.
+        /// </summary>
         private ApplicationExtensions _applicationExt;
+
+        /// <summary>
+        /// Store the stylesheet value.
+        /// </summary>
         private string _stylesheet;
+
+        /// <summary>
+        /// Store the window mode value.
+        /// </summary>
         private Application.WindowMode _windowMode;
+
+        /// <summary>
+        /// Store the app mode value.
+        /// </summary>
         private AppMode _appMode;
+
+        /// <summary>
+        /// The instance of the Dali Stage.
+        /// </summary>
         private Stage _stage;
 
+        /// <summary>
+        /// The default constructor.
+        /// </summary>
         public NUIApplication() : base()
         {
             _appMode = AppMode.Default;
         }
 
+        /// <summary>
+        /// The constructor with stylesheet.
+        /// </summary>
         public NUIApplication(string stylesheet) : base()
         {
             //handle the stylesheet
@@ -49,15 +84,20 @@ namespace Tizen.NUI
             _stylesheet = stylesheet;
         }
 
-        public NUIApplication(string stylesheet, Application.WindowMode windowMode) : base()
+        /// <summary>
+        /// The constructor with stylesheet and window mode.
+        /// </summary>
+        public NUIApplication(string stylesheet, WindowMode windowMode) : base()
         {
             //handle the stylesheet and windowMode
             _appMode = AppMode.StyleSheetWithWindowMode;
             _stylesheet = stylesheet;
-            _windowMode = windowMode;
+            _windowMode = (Application.WindowMode)windowMode;
         }
 
-
+        /// <summary>
+        /// Overrides this method if want to handle behavior.
+        /// </summary>
         protected override void OnPause()
         {
             base.OnPause();
@@ -65,6 +105,10 @@ namespace Tizen.NUI
             LOG("OnPause() is called!");
         }
 
+        /// <summary>
+        /// Overrides this method if want to handle behavior before calling OnCreate().
+        /// stage property is initialized in this overrided method.
+        /// </summary>
         protected override void OnPreCreate()
         {
             switch (_appMode)
@@ -89,6 +133,9 @@ namespace Tizen.NUI
             LOG("OnPreCreate() is called!");
         }
 
+        /// <summary>
+        /// Overrides this method if want to handle behavior.
+        /// </summary>
         protected override void OnResume()
         {
             base.OnResume();
@@ -96,6 +143,9 @@ namespace Tizen.NUI
             LOG("OnResume() is called!");
         }
 
+        /// <summary>
+        /// Overrides this method if want to handle behavior.
+        /// </summary>
         protected override void OnAppControlReceived(AppControlReceivedEventArgs e)
         {
             base.OnAppControlReceived(e);
@@ -107,12 +157,18 @@ namespace Tizen.NUI
             }
         }
 
+        /// <summary>
+        /// Overrides this method if want to handle behavior.
+        /// </summary>
         protected override void OnCreate()
         {
             base.OnCreate();
             LOG("OnCreate() is called!");
         }
 
+        /// <summary>
+        /// Overrides this method if want to handle behavior.
+        /// </summary>
         protected override void OnLocaleChanged(LocaleChangedEventArgs e)
         {
             base.OnLocaleChanged(e);
@@ -120,24 +176,36 @@ namespace Tizen.NUI
             LOG("OnLocaleChanged() is called!");
         }
 
+        /// <summary>
+        /// Overrides this method if want to handle behavior.
+        /// </summary>
         protected override void OnLowBattery(LowBatteryEventArgs e)
         {
             base.OnLowBattery(e);
             LOG("OnLowBattery() is called!");
         }
 
+        /// <summary>
+        /// Overrides this method if want to handle behavior.
+        /// </summary>
         protected override void OnLowMemory(LowMemoryEventArgs e)
         {
             base.OnLowMemory(e);
             LOG("OnLowMemory() is called!");
         }
 
+        /// <summary>
+        /// Overrides this method if want to handle behavior.
+        /// </summary>
         protected override void OnRegionFormatChanged(RegionFormatChangedEventArgs e)
         {
             base.OnRegionFormatChanged(e);
             LOG("OnRegionFormatChanged() is called!");
         }
 
+        /// <summary>
+        /// Overrides this method if want to handle behavior.
+        /// </summary>
         protected override void OnTerminate()
         {
             base.OnTerminate();
@@ -145,11 +213,24 @@ namespace Tizen.NUI
             LOG("OnTerminate() is called!");
         }
 
+        /// <summary>
+        /// The mode of creating NUI application.
+        /// </summary>
         private enum AppMode
         {
             Default = 0,
             StyleSheetOnly = 1,
             StyleSheetWithWindowMode = 2
         }
+
+        /// <summary>
+        /// Enumeration for deciding whether a NUI application window is opaque or transparent.
+        /// </summary>
+        public enum WindowMode
+        {
+            Opaque = 0,
+            Transparent = 1
+        }
+
     }
 }
index 450cc14..91febd1 100755 (executable)
@@ -140,12 +140,12 @@ namespace Tizen.NUI
             }\r
             remove\r
             {\r
-                if (_popUpOutsideTouchedEventCallback != null)\r
+                _popUpOutsideTouchedEventHandler -= value;\r
+\r
+                if (_popUpOutsideTouchedEventCallback == null && _popUpOutsideTouchedEventCallback != null)\r
                 {\r
                     OutsideTouchedSignal().Disconnect(_popUpOutsideTouchedEventCallback);\r
-\r
                 }\r
-                _popUpOutsideTouchedEventHandler -= value;\r
             }\r
         }\r
 \r
@@ -173,11 +173,12 @@ namespace Tizen.NUI
 \r
             remove\r
             {\r
-                if (_popUpShowingEventCallback != null)\r
+                _popUpShowingEventHandler -= value;\r
+\r
+                if (_popUpShowingEventCallback == null && _popUpShowingEventCallback != null)\r
                 {\r
                     ShowingSignal().Disconnect(_popUpShowingEventCallback);\r
                 }\r
-                _popUpShowingEventHandler -= value;\r
             }\r
         }\r
 \r
@@ -206,11 +207,12 @@ namespace Tizen.NUI
 \r
             remove\r
             {\r
-                if (_popUpShownEventCallback == null)\r
+                _popUpShownEventHandler -= value;\r
+\r
+                if (_popUpShownEventCallback == null && _popUpShownEventCallback != null)\r
                 {\r
                     ShownSignal().Disconnect(_popUpShownEventCallback);\r
                 }\r
-                _popUpShownEventHandler -= value;\r
             }\r
         }\r
 \r
@@ -238,11 +240,12 @@ namespace Tizen.NUI
 \r
             remove\r
             {\r
-                if (_popUpHidingEventCallback != null)\r
+                _popUpHidingEventHandler -= value;\r
+\r
+                if (_popUpHidingEventCallback == null && _popUpHidingEventCallback != null)\r
                 {\r
                     HidingSignal().Disconnect(_popUpHidingEventCallback);\r
                 }\r
-                _popUpHidingEventHandler -= value;\r
             }\r
         }\r
 \r
@@ -269,11 +272,12 @@ namespace Tizen.NUI
             }\r
             remove\r
             {\r
-                if (_popUpHiddenEventCallback != null)\r
+                _popUpHiddenEventHandler -= value;\r
+\r
+                if (_popUpHiddenEventCallback == null && _popUpHiddenEventCallback != null)\r
                 {\r
                     HiddenSignal().Disconnect(_popUpHiddenEventCallback);\r
                 }\r
-                _popUpHiddenEventHandler -= value;\r
             }\r
         }\r
 \r
index cdfe67b..7c34b64 100755 (executable)
@@ -131,12 +131,12 @@ namespace Tizen.NUI
             }\r
             remove\r
             {\r
-                if (_stageTouchEventHandler != null)\r
+                _stageTouchEventHandler -= value;\r
+\r
+                if (_stageTouchEventHandler == null && _stageTouchCallback != null)\r
                 {\r
                     TouchSignal().Disconnect(_stageTouchCallback);\r
                 }\r
-\r
-                _stageTouchEventHandler -= value;\r
             }\r
         }\r
 \r
@@ -200,12 +200,13 @@ namespace Tizen.NUI
             }\r
             remove\r
             {\r
-                if (_stageWheelEventHandler != null)\r
+                _stageWheelEventHandler -= value;\r
+\r
+                if (_stageWheelEventHandler == null && _stageWheelCallback != null)\r
                 {\r
                     WheelEventSignal().Disconnect(_stageWheelCallback);\r
                 }\r
 \r
-                _stageWheelEventHandler -= value;\r
             }\r
         }\r
 \r
@@ -269,12 +270,12 @@ namespace Tizen.NUI
             }\r
             remove\r
             {\r
-                if (_stageKeyEventHandler != null)\r
+                _stageKeyEventHandler -= value;\r
+\r
+                if (_stageKeyEventHandler == null && _stageKeyCallback != null)\r
                 {\r
                     KeyEventSignal().Disconnect(_stageKeyCallback);\r
                 }\r
-\r
-                _stageKeyEventHandler -= value;\r
             }\r
         }\r
 \r
@@ -318,12 +319,12 @@ namespace Tizen.NUI
             }\r
             remove\r
             {\r
-                if (_stageEventProcessingFinishedEventHandler != null)\r
+                _stageEventProcessingFinishedEventHandler -= value;\r
+\r
+                if (_stageEventProcessingFinishedEventHandler == null && _stageEventProcessingFinishedEventCallback != null)\r
                 {\r
                     EventProcessingFinishedSignal().Disconnect(_stageEventProcessingFinishedEventCallback);\r
                 }\r
-\r
-                _stageEventProcessingFinishedEventHandler -= value;\r
             }\r
         }\r
 \r
@@ -359,12 +360,12 @@ namespace Tizen.NUI
             }\r
             remove\r
             {\r
-                if (_stageContextLostEventHandler != null)\r
+                _stageContextLostEventHandler -= value;\r
+\r
+                if (_stageContextLostEventHandler == null && _stageContextLostEventCallback != null)\r
                 {\r
                     ContextLostSignal().Disconnect(_stageContextLostEventCallback);\r
                 }\r
-\r
-                _stageContextLostEventHandler -= value;\r
             }\r
         }\r
 \r
@@ -401,12 +402,12 @@ namespace Tizen.NUI
             }\r
             remove\r
             {\r
-                if (_stageContextRegainedEventHandler != null)\r
+                _stageContextRegainedEventHandler -= value;\r
+\r
+                if (_stageContextRegainedEventHandler == null && _stageContextRegainedEventCallback != null)\r
                 {\r
                     ContextRegainedSignal().Disconnect(_stageContextRegainedEventCallback);\r
                 }\r
-\r
-                _stageContextRegainedEventHandler -= value;\r
             }\r
         }\r
 \r
@@ -442,12 +443,13 @@ namespace Tizen.NUI
             }\r
             remove\r
             {\r
-                if (_stageSceneCreatedEventHandler != null)\r
+                _stageSceneCreatedEventHandler -= value;\r
+\r
+                if (_stageSceneCreatedEventHandler == null && _stageSceneCreatedEventCallback != null)\r
                 {\r
                     SceneCreatedSignal().Disconnect(_stageSceneCreatedEventCallback);\r
                 }\r
 \r
-                _stageSceneCreatedEventHandler -= value;\r
             }\r
         }\r
 \r
index 0cae3cb..96be00b 100755 (executable)
@@ -178,12 +178,13 @@ namespace Tizen.NUI
             }\r
             remove\r
             {\r
-                if (_tickCallBack != null)\r
+                _tickEventHandler -= value;\r
+\r
+                if (_tickCallBack == null && _tickCallBack != null)\r
                 {\r
                     this.TickSignal().Disconnect(_tickCallBack);\r
                     _tickCallBack = null;\r
                 }\r
-                _tickEventHandler -= value;\r
             }\r
         }\r
         private bool OnTick()\r
index cc67900..e3323f6 100755 (executable)
@@ -58,11 +58,11 @@ namespace Tizen.NUI
 \r
         public override void Dispose()\r
         {\r
-            if (!Stage.IsInstalled())
-            {
-                DisposeQueue.Instance.Add(this);
-                return;
-            }
+            if (!Stage.IsInstalled())\r
+            {\r
+                DisposeQueue.Instance.Add(this);\r
+                return;\r
+            }\r
 \r
             lock (this)\r
             {\r
@@ -104,12 +104,12 @@ namespace Tizen.NUI
 \r
             remove\r
             {\r
-                if (_keyInputFocusGainedEventHandler != null)\r
+                _keyInputFocusGainedEventHandler -= value;\r
+\r
+                if (_keyInputFocusGainedEventHandler == null && _keyInputFocusGainedCallback != null)\r
                 {\r
                     this.KeyInputFocusGainedSignal().Disconnect(_keyInputFocusGainedCallback);\r
                 }\r
-\r
-                _keyInputFocusGainedEventHandler -= value;\r
             }\r
         }\r
 \r
@@ -146,12 +146,12 @@ namespace Tizen.NUI
 \r
             remove\r
             {\r
-                if (_keyInputFocusLostEventHandler != null)\r
+                _keyInputFocusLostEventHandler -= value;\r
+\r
+                if (_keyInputFocusLostEventHandler == null && _keyInputFocusLostCallback != null)\r
                 {\r
                     this.KeyInputFocusLostSignal().Disconnect(_keyInputFocusLostCallback);\r
                 }\r
-\r
-                _keyInputFocusLostEventHandler -= value;\r
             }\r
         }\r
 \r
@@ -213,12 +213,12 @@ namespace Tizen.NUI
 \r
             remove\r
             {\r
-                if (_keyEventHandler != null)\r
+                _keyEventHandler -= value;\r
+\r
+                if (_keyEventHandler == null && _keyCallback != null)\r
                 {\r
                     this.KeyEventSignal().Disconnect(_keyCallback);\r
                 }\r
-\r
-                _keyEventHandler -= value;\r
             }\r
         }\r
 \r
@@ -260,12 +260,13 @@ namespace Tizen.NUI
 \r
             remove\r
             {\r
-                if (_onRelayoutEventHandler != null)\r
+                _onRelayoutEventHandler -= value;\r
+\r
+                if (_onRelayoutEventHandler == null && _onRelayoutEventCallback != null)\r
                 {\r
                     this.OnRelayoutSignal().Disconnect(_onRelayoutEventCallback);\r
                 }\r
 \r
-                _onRelayoutEventHandler -= value;\r
             }\r
         }\r
 \r
@@ -328,12 +329,13 @@ namespace Tizen.NUI
 \r
             remove\r
             {\r
-                if (_touchDataEventHandler != null)\r
+                _touchDataEventHandler -= value;\r
+\r
+                if (_touchDataEventHandler == null && _touchDataCallback != null)\r
                 {\r
                     this.TouchSignal().Disconnect(_touchDataCallback);\r
                 }\r
 \r
-                _touchDataEventHandler -= value;\r
             }\r
         }\r
 \r
@@ -401,12 +403,13 @@ namespace Tizen.NUI
 \r
             remove\r
             {\r
-                if (_hoverEventHandler != null)\r
+                _hoverEventHandler -= value;\r
+\r
+                if (_hoverEventHandler == null && _hoverEventCallback != null)\r
                 {\r
                     this.HoveredSignal().Disconnect(_hoverEventCallback);\r
                 }\r
 \r
-                _hoverEventHandler -= value;\r
             }\r
         }\r
 \r
@@ -473,12 +476,13 @@ namespace Tizen.NUI
 \r
             remove\r
             {\r
-                if (_wheelEventHandler != null)\r
+                _wheelEventHandler -= value;\r
+\r
+                if (_wheelEventHandler == null && _wheelEventCallback != null)\r
                 {\r
                     this.WheelEventSignal().Disconnect(_wheelEventCallback);\r
                 }\r
 \r
-                _wheelEventHandler -= value;\r
             }\r
         }\r
 \r
@@ -521,12 +525,12 @@ namespace Tizen.NUI
 \r
             remove\r
             {\r
-                if (_onStageEventHandler != null)\r
+                _onStageEventHandler -= value;\r
+\r
+                if (_onStageEventHandler == null && _onStageEventCallback != null)\r
                 {\r
                     this.OnStageSignal().Disconnect(_onStageEventCallback);\r
                 }\r
-\r
-                _onStageEventHandler -= value;\r
             }\r
         }\r
 \r
@@ -564,11 +568,12 @@ namespace Tizen.NUI
 \r
             remove\r
             {\r
-                if (_offStageEventHandler != null)\r
+                _offStageEventHandler -= value;\r
+\r
+                if (_offStageEventHandler == null  && _offStageEventCallback != null)\r
                 {\r
                     this.OnStageSignal().Disconnect(_offStageEventCallback);\r
                 }\r
-                _offStageEventHandler -= value;\r
             }\r
         }\r
 \r
@@ -956,6 +961,11 @@ namespace Tizen.NUI
             }\r
         }\r
 \r
+        /// <summary>\r
+        /// Child Property of FlexContainer\r
+        /// The proportion of the free space in the container the flex item will receive. \r
+        /// If all items in the container set this property, their sizes will be proportional to the specified flex factor\r
+        /// </summary> \r
         public float Flex\r
         {\r
             get\r
@@ -969,6 +979,11 @@ namespace Tizen.NUI
                 SetProperty(FlexContainer.ChildProperty.FLEX, new Tizen.NUI.PropertyValue(value));\r
             }\r
         }\r
+\r
+        /// <summary>\r
+        /// Child Property of FlexContainer\r
+        /// The alignment of the flex item along the cross axis, which, if set, overides the default alignment for all items in the container\r
+        /// </summary> \r
         public int AlignSelf\r
         {\r
             get\r
@@ -982,6 +997,11 @@ namespace Tizen.NUI
                 SetProperty(FlexContainer.ChildProperty.ALIGN_SELF, new Tizen.NUI.PropertyValue(value));\r
             }\r
         }\r
+\r
+        /// <summary>\r
+        /// Child Property of FlexContainer\r
+        /// The space around the flex item\r
+        /// </summary> \r
         public Vector4 FlexMargin\r
         {\r
             get\r