[NUI] Fix layout issue (#586)

* Map non dependant ResizePolicies to Specs.

Maps NaturalSize, FillToParent and FitToChildren to the
new layouting specifications.

NaturalSize is mapped to a fixed value.

Parent relative mappings not done here, need to be done in the
measure once parent sizes known.

Change-Id: I1f11a9dca126541cd534a386583fc36f97646ed4

* All Views in a tree can be layouts

Prior to this fix a View with children within a View would
not become a layout if the parent View did not have SetLayout
explicitly called on it.

Change-Id: Ibf9b214f907a0ea8df30f54269626747c50499ca
Signed-off-by: huiyu.eun <huiyu.eun@samsung.com>
* Disable layouting until set Layout

Added a (static) flag that is set once a Layout is set on any View.

Until this flag is set automatic Layout setting will not occur

Change-Id: Ieff5ed12df75a062a899831681f138c5aa3b6e1f

diff --git a/src/Tizen.NUI/src/internal/NUICoreBackend.cs b/src/Tizen.NUI/src/internal/NUICoreBackend.cs
index a3a4a86..331542c 100755 (executable)
--- a/src/Tizen.NUI/src/internal/NUICoreBackend.cs
+++ b/src/Tizen.NUI/src/internal/NUICoreBackend.cs
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 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.

diff --git a/src/Tizen.NUI/src/public/BaseComponents/View.cs b/src/Tizen.NUI/src/public/BaseComponents/View.cs
index 546f251..969972e 100755 (executable)
--- a/src/Tizen.NUI/src/public/BaseComponents/View.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/View.cs
@@ -27,6 +27,11 @@ namespace Tizen.NUI.BaseComponents
     /// <since_tizen> 3 </since_tizen>
     public class View : Container, IResourcesProvider
     {
+        /// Flag to allow Layouting to be disabled for Views.
+        /// Once a View has a Layout set then any children added to Views from then on will receive
+        /// automatic Layouts.
+        private static bool layoutingDisabled = true;
+
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
         public bool IsResourcesCreated
@@ -1301,8 +1306,9 @@ namespace Tizen.NUI.BaseComponents
 
                 // Only give children a layout if their parent is an explicit container or a pure View.
                 // Pure View meaning not derived from a View, e.g a Legacy container.
-                // layoutSet flag is true when the View became a layout using the SetLayout API
-                if (true == layoutSet && null == child.Layout)
+                // layoutSet flag is true when the View became a layout using the set Layout API opposed to automatically due to it's parent.
+                // First time the set Layout API is used by any View the Window no longer has layoutingDisabled.
+                if ((true == layoutSet || GetType() == typeof(View)) && null == child.Layout && false == layoutingDisabled )
                 {
                     Log.Info("NUI", "Parent[" + Name + "] Layout set[" + layoutSet.ToString() + "] Pure View[" + (!layoutSet).ToString() + "]\n");
                     // If child is a View or explicitly set to require layouting then set child as a LayoutGroup.
@@ -1310,14 +1316,14 @@ namespace Tizen.NUI.BaseComponents
                     if( child.GetType() == typeof(View) ||  true == child.LayoutingRequired )
                     {
                         Log.Info("NUI", "Creating LayoutGroup for " + child.Name + " LayoutingRequired[" + child.LayoutingRequired.ToString() + "]\n");
-                        child.Layout = new LayoutGroup();
+                        child.SetLayout( new LayoutGroup() );
                     }
                     else
                     {
                         // Adding child as a leaf, layouting will not propagate past this child.
                         // Legacy containers will be a LayoutItems too and layout their children how they wish.
                         Log.Info("NUI", "Creating LayoutItem for " + child.Name + "\n");
-                        child.Layout = new LayoutItem();
+                        child.SetLayout( new LayoutItem() );
                     }
                 }
 
@@ -3459,13 +3465,20 @@ namespace Tizen.NUI.BaseComponents
             }
             set
             {
-                Tizen.NUI.NDalicManualPINVOKE.SetLayout__SWIG_1(View.getCPtr(this), LayoutItem.getCPtr(value));
-                value.LayoutChildren.Clear();
+                Log.Info("NUI", "Set Layout on:" + Name + "\n");
+                layoutingDisabled = false;
                 layoutSet = true;
-                foreach (View view in Children)
-                {
-                    value.LayoutChildren.Add(view.Layout);
-                }
+                SetLayout( value );
+            }
+        }
+
+        internal void SetLayout( LayoutItem layout )
+        {
+            Tizen.NUI.NDalicManualPINVOKE.SetLayout__SWIG_1(View.getCPtr(this), LayoutItem.getCPtr(layout) );
+            layout.LayoutChildren.Clear();
+            foreach (View view in Children)
+            {
+                layout.LayoutChildren.Add(view.Layout);
             }
         }
 
@@ -5086,6 +5099,28 @@ namespace Tizen.NUI.BaseComponents
             set
             {
                 SetValue(WidthResizePolicyProperty, value);
+                // Match ResizePolicy to new Layouting.
+                // Parent relative policies can not be mapped at this point as parent size unknown.
+                switch( value )
+                {
+                  case ResizePolicyType.UseNaturalSize :
+                  {
+                    SetProperty(LayoutItemWrapper.ChildProperty.WIDTH_SPECIFICATION, new Tizen.NUI.PropertyValue( NaturalSize.Width) );
+                    break;
+                  }
+                  case ResizePolicyType.FillToParent :
+                  {
+                    SetProperty(LayoutItemWrapper.ChildProperty.WIDTH_SPECIFICATION, new Tizen.NUI.PropertyValue( (int)ChildLayoutData.MatchParent ) );
+                    break;
+                  }
+                  case ResizePolicyType.FitToChildren :
+                  {
+                    SetProperty(LayoutItemWrapper.ChildProperty.WIDTH_SPECIFICATION, new Tizen.NUI.PropertyValue( (int)ChildLayoutData.WrapContent ) );
+                    break;
+                  }
+                  default:
+                  break;
+                }
                 NotifyPropertyChanged();
             }
         }
@@ -5103,6 +5138,28 @@ namespace Tizen.NUI.BaseComponents
             set
             {
                 SetValue(HeightResizePolicyProperty, value);
+                // Match ResizePolicy to new Layouting.
+                // Parent relative policies can not be mapped at this point as parent size unknown.
+                switch( value )
+                {
+                  case ResizePolicyType.UseNaturalSize :
+                  {
+                    SetProperty(LayoutItemWrapper.ChildProperty.HEIGHT_SPECIFICATION, new Tizen.NUI.PropertyValue( NaturalSize.Height) );
+                    break;
+                  }
+                  case ResizePolicyType.FillToParent :
+                  {
+                    SetProperty(LayoutItemWrapper.ChildProperty.HEIGHT_SPECIFICATION, new Tizen.NUI.PropertyValue( (int)ChildLayoutData.MatchParent ) );
+                    break;
+                  }
+                  case ResizePolicyType.FitToChildren :
+                  {
+                    SetProperty(LayoutItemWrapper.ChildProperty.HEIGHT_SPECIFICATION, new Tizen.NUI.PropertyValue( (int)ChildLayoutData.WrapContent ) );
+                    break;
+                  }
+                  default:
+                  break;
+                }
                 NotifyPropertyChanged();
             }
         }