X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2FTizen.NUI%2Fsrc%2Fpublic%2FLayouting%2FLayoutGroup.cs;h=420d0f5414744ddb967098dccfd919e8a70c1a8d;hb=5895a2feaa38faefc52d22793ba879cba74e466e;hp=b449569b3306a7f9b09c3ccc634fffd4a9439bd6;hpb=4296b10a1ab6dbf8433003cb92a05a8594b01e9d;p=platform%2Fcore%2Fcsapi%2Ftizenfx.git

diff --git a/src/Tizen.NUI/src/public/Layouting/LayoutGroup.cs b/src/Tizen.NUI/src/public/Layouting/LayoutGroup.cs
index b449569..420d0f5 100755
--- a/src/Tizen.NUI/src/public/Layouting/LayoutGroup.cs
+++ b/src/Tizen.NUI/src/public/Layouting/LayoutGroup.cs
@@ -110,14 +110,30 @@ namespace Tizen.NUI
 
                     if (LayoutWithTransition)
                     {
+                        var win = Window.Get(Owner);
+
                         if (!childLayout.IsReplaceFlag())
                         {
-                            NUIApplication.GetDefaultWindow().LayoutController.AddToRemovalStack(childLayout);
+                            if (win == null)
+                            {
+                                NUIApplication.GetDefaultWindow().LayoutController.AddToRemovalStack(childLayout);
+                            }
+                            else
+                            {
+                                win.LayoutController.AddToRemovalStack(childLayout);
+                            }
                         }
 
                         childLayout.ConditionForAnimation = childLayout.ConditionForAnimation | TransitionCondition.Remove;
                         // Add LayoutItem to the transition stack so can animate it out.
-                        NUIApplication.GetDefaultWindow().LayoutController.AddTransitionDataEntry(new LayoutData(layoutItem, ConditionForAnimation, 0, 0, 0, 0));
+                        if (win == null)
+                        {
+                            NUIApplication.GetDefaultWindow().LayoutController.AddTransitionDataEntry(new LayoutData(layoutItem, ConditionForAnimation, 0, 0, 0, 0));
+                        }
+                        else
+                        {
+                            win.LayoutController.AddTransitionDataEntry(new LayoutData(layoutItem, ConditionForAnimation, 0, 0, 0, 0));
+                        }
                     }
 
                     // Reset condition for animation ready for next transition when required.