[NUI] Revert "Sync with dalihub & API5 branch (#631)" (#635)

[platform/core/csapi/tizenfx.git] / src / Tizen.NUI / src / public / XamlBinding / Element.cs

diff --git a/src/Tizen.NUI/src/public/XamlBinding/Element.cs b/src/Tizen.NUI/src/public/XamlBinding/Element.cs
index 17f8497..b457dca 100755 (executable)
--- a/src/Tizen.NUI/src/public/XamlBinding/Element.cs
+++ b/src/Tizen.NUI/src/public/XamlBinding/Element.cs
@@ -114,17 +114,17 @@ namespace Tizen.NUI.Binding
         /// <summary>
         /// Gets the element which is the closest ancestor of this element that is a BaseHandle.
         /// </summary>
+        [Obsolete("ParentView is obsolete as of version 2.1.0. Please use Parent instead.")]
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
-        [Obsolete("ParentView is obsolete as of version 2.1.0. Please use Parent instead.")]
-        public BaseHandle ParentView
+        public /*VisualElement*/BaseHandle ParentView
         {
             get
             {
                 Element parent = Parent;
                 while (parent != null)
                 {
-                    var parentView = parent as BaseHandle;
+                    var parentView = parent as /*VisualElement*/BaseHandle;
                     if (parentView != null)
                         return parentView;
                     parent = parent.RealParent;
@@ -606,9 +606,23 @@ namespace Tizen.NUI.Binding
 
         internal static void SetFlowDirectionFromParent(Element child)
         {
-            var parentView = child.Parent;
-            if (parentView == null)
-                return;
+            // IFlowDirectionController controller = child as IFlowDirectionController;
+            // if (controller == null)
+            //         return;
+
+            // if (controller.EffectiveFlowDirection.IsImplicit())
+            // {
+            //         var parentView = child.Parent as IFlowDirectionController;
+            //         if (parentView == null)
+            //                 return;
+
+            //         var flowDirection = parentView.EffectiveFlowDirection.ToFlowDirection();
+
+            //         if (flowDirection != controller.EffectiveFlowDirection.ToFlowDirection())
+            //         {
+            //                 controller.EffectiveFlowDirection = flowDirection.ToEffectiveFlowDirection();
+            //         }
+            // }
         }
 
         /// <summary>
@@ -632,8 +646,8 @@ namespace Tizen.NUI.Binding
                 ReadOnlyCollection<Element> children = queue.Dequeue().LogicalChildrenInternal;
                 for (var i = 0; i < children.Count; i++)
                 {
-                    var child = children[i] as BaseHandle;
-                    if (child == null)
+                    var child = children[i] as /*VisualElement*/BaseHandle;
+                    if (child == null /*|| !child.IsVisible*/)
                         continue;
                     yield return child;
                     queue.Enqueue(child);