[NUI] Make transition select target control (#3622)

Signed-off-by: Seungho Baek <sbsh.baek@samsung.com>

diff --git a/src/Tizen.NUI.Components/Controls/Navigation/Navigator.cs b/src/Tizen.NUI.Components/Controls/Navigation/Navigator.cs
index f157867..8fe3b3a 100755 (executable)
--- a/src/Tizen.NUI.Components/Controls/Navigation/Navigator.cs
+++ b/src/Tizen.NUI.Components/Controls/Navigation/Navigator.cs
@@ -687,7 +687,7 @@ namespace Tizen.NUI.Components
             TransitionSet newTransitionSet = new TransitionSet();
             foreach(KeyValuePair<View, View> pair in sameTaggedViewPair)
             {
-                TransitionItem pairTransition = transition.CreateTransition(pair.Key, pair.Value);
+                TransitionItem pairTransition = transition.CreateTransition(pair.Key, pair.Value, pushTransition);
                 if(pair.Value.TransitionOptions?.TransitionWithChild ?? false)
                 {
                     pairTransition.TransitionWithChild = true;

diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.TransitionItem.cs b/src/Tizen.NUI/src/internal/Interop/Interop.TransitionItem.cs
index 9ecf81c..27008d5 100755 (executable)
--- a/src/Tizen.NUI/src/internal/Interop/Interop.TransitionItem.cs
+++ b/src/Tizen.NUI/src/internal/Interop/Interop.TransitionItem.cs
@@ -28,7 +28,7 @@ namespace Tizen.NUI
             public static extern IntPtr NewEmpty();
 
             [DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Transition_New")]
-            public static extern IntPtr New(HandleRef source, HandleRef destination, HandleRef timePeriod);
+            public static extern IntPtr New(HandleRef source, HandleRef destination, bool useDestinationTarget, HandleRef timePeriod);
 
             [DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_delete_Transition")]
             public static extern void Delete(HandleRef transition);

diff --git a/src/Tizen.NUI/src/internal/Transition/TransitionItem.cs b/src/Tizen.NUI/src/internal/Transition/TransitionItem.cs
index ddee4a0..be66ffc 100755 (executable)
--- a/src/Tizen.NUI/src/internal/Transition/TransitionItem.cs
+++ b/src/Tizen.NUI/src/internal/Transition/TransitionItem.cs
@@ -32,7 +32,7 @@ namespace Tizen.NUI
         /// Creates an initialized transition.<br />
         /// </summary>
         /// <remarks>DurationmSeconds must be greater than zero.</remarks>
-        public TransitionItem(View source, View destination, TimePeriod timePeriod, AlphaFunction alphaFunction) : this(Interop.TransitionItem.New(source.SwigCPtr, destination.SwigCPtr, timePeriod.SwigCPtr), true)
+        public TransitionItem(View source, View destination, bool useDestinationTarget, TimePeriod timePeriod, AlphaFunction alphaFunction) : this(Interop.TransitionItem.New(source.SwigCPtr, destination.SwigCPtr, useDestinationTarget, timePeriod.SwigCPtr), true)
         {
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             AlphaFunction = alphaFunction;

diff --git a/src/Tizen.NUI/src/public/Transition/Transition.cs b/src/Tizen.NUI/src/public/Transition/Transition.cs
index 8d2f806..7e2c5e8 100644 (file)
--- a/src/Tizen.NUI/src/public/Transition/Transition.cs
+++ b/src/Tizen.NUI/src/public/Transition/Transition.cs
@@ -35,9 +35,9 @@ namespace Tizen.NUI
         {
         }
 
-        internal TransitionItem CreateTransition(View source, View destination)
+        internal TransitionItem CreateTransition(View source, View destination, bool useDestinationTarget)
         {
-            return new TransitionItem(source, destination, GetTimePeriod(), GetAlphaFunction());
+            return new TransitionItem(source, destination, useDestinationTarget, GetTimePeriod(), GetAlphaFunction());
         }
     }
 }

diff --git a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/PageTransitionSample.cs b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/PageTransitionSample.cs
index d14da22..2c7c215 100755 (executable)
--- a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/PageTransitionSample.cs
+++ b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/PageTransitionSample.cs
@@ -96,7 +96,7 @@ namespace Tizen.NUI.Samples
                 {
                     TimePeriod = new TimePeriod(500),
                     AlphaFunction = new AlphaFunction(AlphaFunction.BuiltinFunctions.Default),
-                    Direction = SlideTransitionDirection.Right
+                    Direction = SlideTransitionDirection.Top
                 },
             };
             navigator.Push(mainPage);