[NUI] Sync dalihub & Fix VD build error (#824)

author huiyueun <35286162+huiyueun@users.noreply.github.com>

Thu, 9 May 2019 07:08:14 +0000 (16:08 +0900)

committer dongsug-song <35130733+dongsug-song@users.noreply.github.com>

Thu, 9 May 2019 07:08:14 +0000 (16:08 +0900)
author huiyueun <35286162+huiyueun@users.noreply.github.com>
Thu, 9 May 2019 07:08:14 +0000 (16:08 +0900)
committer dongsug-song <35130733+dongsug-song@users.noreply.github.com>
Thu, 9 May 2019 07:08:14 +0000 (16:08 +0900)
diff --git a/packaging/csapi-tizenfx.spec b/packaging/csapi-tizenfx.spec

index 3febaf8..ed33ea3 100644 (file)
--- a/packaging/csapi-tizenfx.spec
+++ b/packaging/csapi-tizenfx.spec
@@ -1,7 +1,7 @@
  # Auto-generated from csapi-tizenfx.spec.in by makespec.sh
  
  %define TIZEN_NET_API_VERSION 6
-%define TIZEN_NET_RPM_VERSION 6.0.0.999+nui505
+%define TIZEN_NET_RPM_VERSION 6.0.0.999+nui550
  %define TIZEN_NET_NUGET_VERSION 6.0.0.99999
  
  %define DOTNET_ASSEMBLY_PATH /usr/share/dotnet.tizen/framework
diff --git a/src/Tizen.NUI/src/internal/FriendAssembly.cs b/src/Tizen.NUI/src/internal/FriendAssembly.cs

index 86651d3..d0864b7 100755 (executable)
--- a/src/Tizen.NUI/src/internal/FriendAssembly.cs
+++ b/src/Tizen.NUI/src/internal/FriendAssembly.cs
@@ -30,6 +30,11 @@ using System.Runtime.CompilerServices;
  [assembly: InternalsVisibleTo("Tizen.TV.NUI.Example, PublicKey=0024000004800000940000000602000000240000525341310004000001000100ed445c2a988d35b99e5766f42eef33d89d1f67225db051f011abcfce47a4788875c39750a2e5695f1ec117f41d96610419811762669f98131db30a6e64c6bb8fde3731f373f6cda4c0087d121f5108559f216dc015807dc46ec5a4d1b63f5deff64c01754a0db0dc849bc300672572cbd2697432ab6c193ebf9fade6bf0f2aad")]
  [assembly: InternalsVisibleTo("NuiSample, PublicKey=0024000004800000940000000602000000240000525341310004000001000100a5bcf6fb6095141fa8146ec74d5b0be8b09a063f8f1f32604b10df6e498788182840bd15c93ba1a5c0b9aeee8fe2be42ea9c0b5fe32e1d6d5602b2a4fa813114fd58c4b2910d93e5181b90925458b4b8b003c30d97830a17ad90a92f34f60a11f67a78757e6b2035e799be5ab69a41ede17cad2e2b7967fbf49b685452496be0")]
  
+[assembly: InternalsVisibleTo("Tizen.TV.FLUX, PublicKey=0024000004800000940000000602000000240000525341310004000001000100ed445c2a988d35b99e5766f42eef33d89d1f67225db051f011abcfce47a4788875c39750a2e5695f1ec117f41d96610419811762669f98131db30a6e64c6bb8fde3731f373f6cda4c0087d121f5108559f216dc015807dc46ec5a4d1b63f5deff64c01754a0db0dc849bc300672572cbd2697432ab6c193ebf9fade6bf0f2aad")]    
+[assembly: InternalsVisibleTo("Tizen.TV.FLUX.Component, PublicKey=0024000004800000940000000602000000240000525341310004000001000100ed445c2a988d35b99e5766f42eef33d89d1f67225db051f011abcfce47a4788875c39750a2e5695f1ec117f41d96610419811762669f98131db30a6e64c6bb8fde3731f373f6cda4c0087d121f5108559f216dc015807dc46ec5a4d1b63f5deff64c01754a0db0dc849bc300672572cbd2697432ab6c193ebf9fade6bf0f2aad")]
+[assembly: InternalsVisibleTo("Tizen.TV.FLUX.Example, PublicKey=0024000004800000940000000602000000240000525341310004000001000100ed445c2a988d35b99e5766f42eef33d89d1f67225db051f011abcfce47a4788875c39750a2e5695f1ec117f41d96610419811762669f98131db30a6e64c6bb8fde3731f373f6cda4c0087d121f5108559f216dc015807dc46ec5a4d1b63f5deff64c01754a0db0dc849bc300672572cbd2697432ab6c193ebf9fade6bf0f2aad")]
+
+       
  namespace Tizen.NUI
  {
  }
diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.TextField.cs b/src/Tizen.NUI/src/internal/Interop/Interop.TextField.cs

index e475ff7..d62e265 100755 (executable)
--- a/src/Tizen.NUI/src/internal/Interop/Interop.TextField.cs
+++ b/src/Tizen.NUI/src/internal/Interop/Interop.TextField.cs
@@ -302,6 +302,16 @@ namespace Tizen.NUI
  
              [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_TextField_Property_ELLIPSIS_get")]
              public static extern int TextField_Property_ELLIPSIS_get();
+
+                       
+            [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_Dali_TextField_SelectWholeText")]
+            public static extern void TextField_SelectWholeText(global::System.Runtime.InteropServices.HandleRef jarg1);
+               
+            [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_TextField_Property_ENABLE_GRAB_HANDLE_get")]
+            public static extern int TextField_Property_ENABLE_GRAB_HANDLE_get();
+    
+            [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_TextField_Property_ENABLE_GRAB_HANDLE_POPUP_get")]
+            public static extern int TextField_Property_ENABLE_GRAB_HANDLE_POPUP_get();
          }
      }
  }
diff --git a/src/Tizen.NUI/src/internal/Interop/NDalicPINVOKE.cs b/src/Tizen.NUI/src/internal/Interop/NDalicPINVOKE.cs

index 64a0876..a14d2c8 100755 (executable)
--- a/src/Tizen.NUI/src/internal/Interop/NDalicPINVOKE.cs
+++ b/src/Tizen.NUI/src/internal/Interop/NDalicPINVOKE.cs
@@ -241,6 +241,10 @@ namespace Tizen.NUI
              Tizen.Log.Error("NUI", "Create NDalicPINVOKE");
          }
  
+               [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_delete_BaseHandle")]
+               public static extern void delete_BaseHandle(global::System.Runtime.InteropServices.HandleRef jarg1);
+
+
          [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_Dali_Application_SWIGUpcast")]
          public static extern global::System.IntPtr Application_SWIGUpcast(global::System.IntPtr jarg1);
  
diff --git a/src/Tizen.NUI/src/internal/Layouting/AbsoluteLayout.cs b/src/Tizen.NUI/src/internal/Layouting/AbsoluteLayout.cs

index 1a29a34..3741b3d 100755 (executable)
--- a/src/Tizen.NUI/src/internal/Layouting/AbsoluteLayout.cs
+++ b/src/Tizen.NUI/src/internal/Layouting/AbsoluteLayout.cs
@@ -48,7 +48,6 @@ namespace Tizen.NUI
  
          protected override void OnMeasure(MeasureSpecification widthMeasureSpec, MeasureSpecification heightMeasureSpec)
          {
-            Log.Info("NUI", "Measuring[" + _children.Count + "] child(ren)\n");
              float totalHeight = 0.0f;
              float totalWidth = 0.0f;
  
@@ -85,7 +84,6 @@ namespace Tizen.NUI
                      // Store current width and height needed to contain all children.
                      totalWidth = maxPositionX - minPositionX;
                      totalHeight = maxPositionY - minPositionY;
-                    Log.Info( "NUI" , "AbsoluteLayout::OnMeasure child width(" + childWidth + ") height(" + childHeight + ")\n" );
  
                      if (childLayout.MeasuredWidthAndState.State == MeasuredSize.StateType.MeasuredSizeTooSmall)
                      {
@@ -98,7 +96,6 @@ namespace Tizen.NUI
                  }
              }
  
-            Log.Info( "NUI" , "AbsoluteLayout::OnMeasure total width(" + totalWidth + ") total height(" + totalHeight + ")\n" );
  
              MeasuredSize widthSizeAndState = ResolveSizeAndState(new LayoutLength(totalWidth), widthMeasureSpec, MeasuredSize.StateType.MeasuredSizeOK);
              MeasuredSize heightSizeAndState = ResolveSizeAndState(new LayoutLength(totalHeight), heightMeasureSpec, MeasuredSize.StateType.MeasuredSizeOK);
@@ -132,12 +129,6 @@ namespace Tizen.NUI
                      LayoutLength childLeft = new LayoutLength(childPosition.X);
                      LayoutLength childTop = new LayoutLength(childPosition.Y);
  
-                    Log.Info("NUI", "Child View:" + childLayout.Owner.Name
-                                    + " position(" + childLeft.AsRoundedValue() + ", "
-                                    + childTop.AsRoundedValue() + ") width:"
-                                    + childWidth.AsRoundedValue() + " height:"
-                                    + childHeight.AsRoundedValue() + "\n");
-
                      childLayout.Layout( childLeft, childTop, childLeft + childWidth, childTop + childHeight );
                  }
              }
diff --git a/src/Tizen.NUI/src/internal/Layouting/GridLayout.cs b/src/Tizen.NUI/src/internal/Layouting/GridLayout.cs

index 917af76..9ccf0c7 100755 (executable)
--- a/src/Tizen.NUI/src/internal/Layouting/GridLayout.cs
+++ b/src/Tizen.NUI/src/internal/Layouting/GridLayout.cs
@@ -109,7 +109,7 @@ namespace Tizen.NUI
              int desiredChildHeight;
              int desiredChildWidth;
  
-            Extents gridLayoutPadding = Owner.Padding;
+            Extents gridLayoutPadding = Padding;
  
              var childCount = _children.Count;
  
@@ -127,12 +127,12 @@ namespace Tizen.NUI
                  desiredChildWidth = (int)childLayoutItem.MeasuredWidth.Size.AsRoundedValue();
  
                  // If child has a margin then add it to desired size
-                Extents childMargin = childOwner.Margin;
+
+                Extents childMargin = childLayoutItem.Margin;
                  desiredChildHeight += childMargin.Top + childMargin.Bottom;
                  desiredChildWidth += childMargin.Start + childMargin.End;
  
                  _totalWidth = desiredChildWidth * _columns;
-                Log.Info("NUI", "Grid::OnMeasure TotalDesiredWidth(" + _totalWidth + ") \n" );
  
                  // Include padding for max and min checks
                  _totalWidth += gridLayoutPadding.Start + gridLayoutPadding.End;
@@ -150,7 +150,6 @@ namespace Tizen.NUI
                  availableContentWidth = _totalWidth - gridLayoutPadding.Start - gridLayoutPadding.End;
                  widthSize = _totalWidth;
  
-                Log.Info("NUI", "Grid::OnMeasure availableContentWidth:" + availableContentWidth + " TotalWidth(" + _totalWidth + ") \n" );
                  // HEIGHT SPECIFICATIONS
  
                  // heightMode EXACTLY so grid must be the given height
@@ -164,7 +163,6 @@ namespace Tizen.NUI
                          {
                            _totalHeight += desiredChildHeight;
                          }
-                        Log.Info( "NUI", "Grid::OnMeasure TotalDesiredHeight(" + _totalHeight + ") \n" );
  
                          // Ensure ourHeight does not exceed specified at most height
                          _totalHeight = Math.Min( _totalHeight, heightSize );
@@ -206,13 +204,13 @@ namespace Tizen.NUI
          {
              List<GridLocations.Cell> locations = _locations.GetLocations();
  
-            Extents gridLayoutPadding = Owner.Padding;
+            Extents gridLayoutPadding = Padding;
              Extents childMargins = new Extents();
  
              // Margin for all children dependant on if set on first child
              if( _children.Count > 0 )
              {
-              childMargins = _children[0]?.Owner?.Margin;
+              childMargins = _children[0]?.Margin;
              }
  
              int index = 0;
@@ -229,9 +227,6 @@ namespace Tizen.NUI
                      int y1 = locations[ index ].Top;
                      int y2 = locations[ index ].Bottom;
  
-                    Log.Info("NUI", "CellSize(" + (x2-x1) + "," + (y2-y1) +
-                                    ") CellPos(" + x1 + "," + y1 + "," + x2 + "," + y2  +")\n");
-
                      // Offset children by the grids padding if present
                      x1 += gridLayoutPadding.Start;
                      x2 += gridLayoutPadding.Start;
diff --git a/src/Tizen.NUI/src/internal/Layouting/GridLocations.cs b/src/Tizen.NUI/src/internal/Layouting/GridLocations.cs

index bfeadd8..fd987b7 100755 (executable)
--- a/src/Tizen.NUI/src/internal/Layouting/GridLocations.cs
+++ b/src/Tizen.NUI/src/internal/Layouting/GridLocations.cs
@@ -99,9 +99,6 @@ namespace Tizen.NUI
                  rowHeight = (availableHeight / numberOfRows);
              }
  
-            Log.Info("NUI", "ColumnWidth[" + columnWidth + "] RowHeight[" +rowHeight + "] NumberOfRows["
-                            + numberOfRows + "] NumberOfColumns[" + numberOfColumns +"]\n");
-
              int  y1 = 0;
              int  y2 = y1 + rowHeight;
  
diff --git a/src/Tizen.NUI/src/internal/Layouting/LayoutController.cs b/src/Tizen.NUI/src/internal/Layouting/LayoutController.cs

index e395494..397a404 100644 (file)
--- a/src/Tizen.NUI/src/internal/Layouting/LayoutController.cs
+++ b/src/Tizen.NUI/src/internal/Layouting/LayoutController.cs
@@ -80,6 +80,7 @@ namespace Tizen.NUI
              }
          }
  
+
          /// <summary>
          /// Destructor which adds LayoutController to the Dispose queue.
          /// </summary>
@@ -139,13 +140,11 @@ namespace Tizen.NUI
                  {
                      if (rootNode.GetType() == typeof(View))
                      {
-                        Log.Info("NUI", "Creating LayoutGroup for " + rootNode.Name  + "\n");
                          rootNode.Layout = new LayoutGroup();
                          AutomaticallyAssignLayouts(rootNode);
                      }
                      else
                      {
-                        Log.Info("NUI", "Creating LayoutItem for " + rootNode.Name  + "\n");
                          rootNode.Layout = new LayoutItem();
                      }
                  }
@@ -197,8 +196,6 @@ namespace Tizen.NUI
                      rootSize = new Size2D(_window.Size.Width, _window.Size.Height);
                  }
  
-                Log.Info("NUI", "Root parent size(" + rootSize.Width + "," + rootSize.Height + ")\n");
-
                  // Determine measure specification for root.
                  // The root layout policy could be an exact size, be match parent or wrap children.
                  // If wrap children then at most it can be the root parent size.
@@ -254,14 +251,13 @@ namespace Tizen.NUI
          /// </summary>
          private void Process(int id)
          {
-            Log.Info("NUI", "LayoutController Process id:" + id + "\n");
-
              Layer defaultLayer = _window.GetDefaultLayer();
              for (uint i = 0; i < defaultLayer.ChildCount; i++)
              {
                  View view = defaultLayer.GetChildAt(i);
                  FindRootLayouts(view);
              }
+
          }
  
          /// <summary>
diff --git a/src/Tizen.NUI/src/internal/Layouting/LayoutGroup.cs b/src/Tizen.NUI/src/internal/Layouting/LayoutGroup.cs

index a5fee77..d74749a 100755 (executable)
--- a/src/Tizen.NUI/src/internal/Layouting/LayoutGroup.cs
+++ b/src/Tizen.NUI/src/internal/Layouting/LayoutGroup.cs
@@ -51,7 +51,6 @@ namespace Tizen.NUI
          /// </summary>
          public virtual void Add(LayoutItem childLayout)
          {
-            Log.Info("NUI","Add Layout:" + childLayout.Owner.Name + " to Layout:" + Owner.Name + "\n");
              _children.Add(childLayout);
              childLayout.SetParent(this);
              OnChildAdd(childLayout);
@@ -63,7 +62,6 @@ namespace Tizen.NUI
          /// </summary>
          public void RemoveAll()
          {
-            Log.Info("NUI","Removing:" + _children.Count + "\n");
              foreach( LayoutItem childLayout in _children )
              {
                  childLayout.Owner = null;
@@ -91,8 +89,6 @@ namespace Tizen.NUI
  
          private void AddChildToLayoutGroup(View child)
          {
-            Log.Info("NUI", "Adding child View:" + child.Name + " to Layout:" + Owner?.Name + "\n");
-
              // 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 set Layout API opposed to automatically due to it's parent.
@@ -104,19 +100,16 @@ namespace Tizen.NUI
                  // Only wrap View with a Layout if a child a pure View or Layout explicitly set on this Layout
                  if ((true == Owner.layoutSet || GetType() == typeof(View)))
                  {
-                    Log.Info("NUI", "Parent[" + Owner.Name + "] Layout set[" + Owner.layoutSet.ToString() + "] Pure View[" + (!Owner.layoutSet).ToString() + "]\n");
                      // If child of this layout is a pure View then assign it a LayoutGroup
                      // If the child is derived from a View then it may be a legacy or existing container hence will do layouting itself.
                      if (child.GetType() == typeof(View))
                      {
-                        Log.Info("NUI", "Creating LayoutGroup for " + child.Name +  "]\n");
                          child.Layout = 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();
                      }
                  }
@@ -137,8 +130,6 @@ namespace Tizen.NUI
          /// <param name="child">Child to remove.true</param>
          private void RemoveChildFromLayoutGroup(View child)
          {
-            Log.Info("NUI", "Removing child View:" + child.Name + " from Layout:" + Owner?.Name + "\n");
-
              if(child.Layout != null)
              {
                  Remove(child.Layout);
@@ -256,8 +247,6 @@ namespace Tizen.NUI
                  }
              } // switch
  
-            Log.Info("NUI", "MeasureSpecification resultSize:" + resultSize.AsRoundedValue()
-                            + " resultMode:" + resultMode + "\n");
              return new MeasureSpecification( resultSize, resultMode );
          }
  
@@ -271,7 +260,6 @@ namespace Tizen.NUI
          /// <param name="heightMeasureSpec">vertical space requirements as imposed by the parent.</param>
          protected override void OnMeasure(MeasureSpecification widthMeasureSpec, MeasureSpecification heightMeasureSpec)
          {
-            Log.Info("NUI", "OnMeasure\n");
              LayoutLength measuredWidth = new LayoutLength(0.0f);
              LayoutLength measuredHeight = new LayoutLength(0.0f);
  
@@ -283,7 +271,8 @@ namespace Tizen.NUI
                      MeasureChild( childLayout, widthMeasureSpec, heightMeasureSpec );
                      LayoutLength childWidth = new LayoutLength(childLayout.MeasuredWidth.Size);
                      LayoutLength childHeight = new LayoutLength( childLayout.MeasuredHeight.Size);
-                    Extents childMargin = childLayout.Owner.Margin;
+
+                    Extents childMargin = childLayout.Margin;
                      measuredWidth = new LayoutLength(Math.Max( measuredWidth.AsDecimal(), childWidth.AsDecimal() + childMargin.Start + childMargin.End));
                      measuredHeight = new LayoutLength(Math.Max( measuredHeight.AsDecimal(), childHeight.AsDecimal() + childMargin.Top + childMargin.Bottom));
                  }
@@ -311,7 +300,6 @@ namespace Tizen.NUI
          /// <param name="bottom">Bottom position, relative to parent.</param>
          protected override void OnLayout(bool changed, LayoutLength left, LayoutLength top, LayoutLength right, LayoutLength bottom)
          {
-            Log.Info("NUI", "OnLayout\n");
              foreach( LayoutItem childLayout in _children )
              {
                  if( childLayout !=null )
@@ -327,8 +315,8 @@ namespace Tizen.NUI
                          // Margin and Padding only supported when child anchor point is TOP_LEFT.
                          if ( owner.PivotPoint == PivotPoint.TopLeft || ( owner.PositionUsesPivotPoint == false ) )
                          {
-                            childLeft = childLeft + owner.Padding.Start + childLayout.Owner.Margin.Start;
-                            childTop = childTop + owner.Padding.Top + childLayout.Owner.Margin.Top;
+                            childLeft = childLeft + owner.Padding.Start + childLayout.Margin.Start;
+                            childTop = childTop + owner.Padding.Top + childLayout.Margin.Top;
                          }
                      }
                      childLayout.Layout( childLeft, childTop, childLeft + childLayout.MeasuredWidth.Size, childTop + childLayout.MeasuredHeight.Size );
@@ -351,7 +339,6 @@ namespace Tizen.NUI
          /// </summary>
          protected override void OnAttachedToOwner()
          {
-            Log.Info("NUI", "Attaching to Owner:" + Owner.Name + "\n");
              // Layout takes ownership of it's owner's children.
              foreach (View view in Owner.Children)
              {
@@ -408,11 +395,8 @@ namespace Tizen.NUI
          protected virtual void MeasureChild(LayoutItem child, MeasureSpecification parentWidthMeasureSpec, MeasureSpecification parentHeightMeasureSpec)
          {
              View childOwner = child.Owner;
-            Log.Info("NUI", "LayoutGroup MeasureChild:" + childOwner.Name
-                          + " child widthSpecification policy:" + childOwner.WidthSpecification
-                          + " child heightSpecification policy:" + childOwner.HeightSpecification + "\n");
  
-            Extents padding = childOwner.Padding; // Padding of this layout's owner, not of the child being measured.
+            Extents padding = child.Padding; // Padding of this layout's owner, not of the child being measured.
  
              MeasureSpecification childWidthMeasureSpec = GetChildMeasureSpecification( parentWidthMeasureSpec,
                                                                                         new LayoutLength(padding.Start + padding.End ),
@@ -442,7 +426,7 @@ namespace Tizen.NUI
              int desiredWidth = childOwner.WidthSpecification;
              int desiredHeight = childOwner.HeightSpecification;
  
-            Extents padding = childOwner.Padding; // Padding of this layout's owner, not of the child being measured.
+            Extents padding = child.Padding; // Padding of this layout's owner, not of the child being measured.
  
              MeasureSpecification childWidthMeasureSpec = GetChildMeasureSpecification( parentWidthMeasureSpec,
                                                                                         new LayoutLength( padding.Start + padding.End ) +
diff --git a/src/Tizen.NUI/src/internal/Layouting/LayoutItem.cs b/src/Tizen.NUI/src/internal/Layouting/LayoutItem.cs

index d595dae..1249749 100755 (executable)
--- a/src/Tizen.NUI/src/internal/Layouting/LayoutItem.cs
+++ b/src/Tizen.NUI/src/internal/Layouting/LayoutItem.cs
@@ -50,16 +50,52 @@ namespace Tizen.NUI
          private LayoutLength _bottom;
          private LayoutData _layoutData;
  
+        private Extents _padding;
+        private Extents _margin;
+
          /// <summary>
-        /// The View that this Layout has been assigned to.
+        /// [Draft] The View that this Layout has been assigned to.
          /// </summary>
          public View Owner{get; set;}  // Should not keep a View alive.
  
          /// <summary>
+        /// [Draft] Margin for this LayoutItem
+        /// </summary>
+        public Extents Margin
+        {
+            get
+            {
+                return _margin;
+            }
+            set
+            {
+                _margin = value;
+                RequestLayout();
+            }
+        }
+
+        /// <summary>
+        /// [Draft] Padding for this LayoutItem
+        /// </summary>
+        public Extents Padding
+        {
+            get
+            {
+                return _padding;
+            }
+            set
+            {
+                _padding = value;
+                RequestLayout();
+            }
+        }
+
+        /// <summary>
          /// [Draft] Constructor
          /// </summary>
          public LayoutItem()
          {
+            Initialize();
          }
  
          /// <summary>
@@ -69,11 +105,7 @@ namespace Tizen.NUI
          public LayoutItem(View owner)
          {
              Owner = owner;
-            _layoutData = new LayoutData();
-            _left = new LayoutLength(0);
-            _top = new LayoutLength(0);
-            _right = new LayoutLength(0);
-            _bottom = new LayoutLength(0);
+            Initialize();
          }
  
          /// <summary>
@@ -83,7 +115,6 @@ namespace Tizen.NUI
          public void SetParent( ILayoutParent parent)
          {
              Parent = parent as LayoutGroup;
-            Log.Info("NUI", "Setting Parent Layout for:" +  Owner?.Name + " to (Parent):" + (parent == null ? "null":parent.ToString() ) + "\n");
          }
  
          /// <summary>
@@ -104,6 +135,17 @@ namespace Tizen.NUI
              Owner?.ResetLayout();
          }
  
+        private void Initialize()
+        {
+            _layoutData = new LayoutData();
+            _left = new LayoutLength(0);
+            _top = new LayoutLength(0);
+            _right = new LayoutLength(0);
+            _bottom = new LayoutLength(0);
+            _padding = new Extents(0,0,0,0);
+            _margin = new Extents(0,0,0,0);
+        }
+
          /// <summary>
          /// Get the View owning this LayoutItem
          /// </summary>
@@ -151,8 +193,6 @@ namespace Tizen.NUI
              bool needsLayout = specChanged && ( !isSpecExactly || !matchesSpecSize);
              needsLayout = needsLayout || ((Flags & LayoutFlags.ForceLayout) == LayoutFlags.ForceLayout);
  
-            Log.Info("NUI", "Measuring:" + Owner.Name + " needsLayout[" + needsLayout.ToString() + "]\n");
-
              if (needsLayout)
              {
                  OnMeasure(widthMeasureSpec, heightMeasureSpec);
@@ -161,8 +201,6 @@ namespace Tizen.NUI
              }
              OldWidthMeasureSpec = widthMeasureSpec;
              OldHeightMeasureSpec = heightMeasureSpec;
-
-            Log.Info("NUI", "LayoutItem Measure owner:" + Owner.Name + " width:" + widthMeasureSpec.Size.AsRoundedValue() + " height:" +  heightMeasureSpec.Size.AsRoundedValue() + "\n");
          }
  
          /// <summary>
@@ -177,14 +215,11 @@ namespace Tizen.NUI
          /// <param name="bottom">Bottom position, relative to parent.</param>
          public void Layout(LayoutLength left, LayoutLength top, LayoutLength right, LayoutLength bottom)
          {
-            Log.Info("NUI", "LayoutItem Layout owner:" + Owner.Name + "\n");
-
              bool changed = SetFrame(left, top, right, bottom);
  
              // Check if Measure needed before Layouting
              if (changed || ((Flags & LayoutFlags.LayoutRequired) == LayoutFlags.LayoutRequired))
              {
-                Log.Info("NUI", "LayoutItem Layout Frame changed or Layout forced\n");
                  OnLayout(changed, left, top, right, bottom);
                  // Clear flag
                  Flags &= ~LayoutFlags.LayoutRequired;
@@ -235,8 +270,6 @@ namespace Tizen.NUI
                  }
              }
  
-            Log.Info("NUI", "DefaultSize :" + result.AsRoundedValue() +  "\n");
-
              return result;
          }
  
@@ -251,7 +284,6 @@ namespace Tizen.NUI
          /// </summary>
          public void RequestLayout()
          {
-            Log.Info("NUI", "RequestLayout on:" + Owner?.Name + "\n");
              Flags = Flags | LayoutFlags.ForceLayout;
              Window.Instance.LayoutController.RequestLayout(this);
          }
@@ -313,7 +345,6 @@ namespace Tizen.NUI
              get
              {
                  int naturalWidth = Owner.NaturalSize2D.Width;
-                Log.Info("NUI", "NaturalWidth for: " + Owner.Name + " :" + naturalWidth +"\n");
                  return new LayoutLength(Math.Max( MinimumWidth.AsDecimal(), naturalWidth ));
              }
          }
@@ -327,7 +358,6 @@ namespace Tizen.NUI
              get
              {
                  int naturalHeight = Owner.NaturalSize2D.Height;
-                Log.Info("NUI", "NaturalHeight for: " + Owner.Name + " :" + naturalHeight +"\n");
                  return new LayoutLength(Math.Max( MinimumHeight.AsDecimal(), naturalHeight ));
              }
          }
@@ -398,9 +428,6 @@ namespace Tizen.NUI
          /// <param name="measuredHeight">The measured height of this layout.</param>
          protected void SetMeasuredDimensions( MeasuredSize measuredWidth, MeasuredSize measuredHeight )
          {
-            Log.Info("NUI", "For " + Owner.Name + " MeasuredWidth:" + measuredWidth.Size.AsRoundedValue()
-                                   + " MeasureHeight:" + measuredHeight.Size.AsRoundedValue() + "\n");
-
              MeasuredWidth = measuredWidth;
              MeasuredHeight = measuredHeight;
              Flags = Flags | LayoutFlags.MeasuredDimensionSet;
@@ -487,10 +514,6 @@ namespace Tizen.NUI
              Owner.SetY(_top.AsRoundedValue());
              Owner.SetSize((int)newWidth.AsRoundedValue(), (int)newHeight.AsRoundedValue());
  
-            Log.Info("NUI", "Frame set for " + Owner.Name + " to left:" + _left.AsRoundedValue() + " top:"
-                            + _top.AsRoundedValue() + " width: " + newWidth.AsRoundedValue() + " height: "
-                            + newHeight.AsRoundedValue() + "\n");
-
              return changed;
          }
  
diff --git a/src/Tizen.NUI/src/internal/Layouting/LinearLayout.cs b/src/Tizen.NUI/src/internal/Layouting/LinearLayout.cs

index a7a4a16..368be21 100755 (executable)
--- a/src/Tizen.NUI/src/internal/Layouting/LinearLayout.cs
+++ b/src/Tizen.NUI/src/internal/Layouting/LinearLayout.cs
@@ -183,19 +183,12 @@ namespace Tizen.NUI
              // Weighted children are not measured at this phase.
              // Available space for weighted children will be calculated in the phase 2 based on totalLength value.
  
-            Log.Info("NUI", "Measuring Horizontal, " + _children.Count + " child(ren) with parent width mode:" + widthMode + ",height mode:" + heightMode + "\n");
-
              foreach( LayoutItem childLayout in _children )
              {
                  LayoutLength childDesiredWidth = new LayoutLength(childLayout.Owner.WidthSpecification);
                  LayoutLength childDesiredHeight = new LayoutLength(childLayout.Owner.HeightSpecification);
                  float childWeight = childLayout.Owner.Weight;
-                Extents childMargin = childLayout.Owner.Margin;
-                Log.Info("NUI", "Retrieved parameters for child:" + childLayout.Owner.Name
-                                + " childDesiredWidth: " + childDesiredWidth.AsRoundedValue()
-                                + " childDesiredHeight:" + childDesiredHeight.AsRoundedValue()
-                                + " childWeight:" + childWeight+ "\n");
-
+                Extents childMargin = childLayout.Margin;
                  totalWeight += childWeight;
  
                  bool useExcessSpace = (childDesiredWidth.AsRoundedValue() == 0 ) && (childWeight > 0);
@@ -211,9 +204,9 @@ namespace Tizen.NUI
                          // this child is only laid out using excess space. Measure
                          // using WRAP_CONTENT so that we can find out the view's
                          // optimal width.
-                        MeasureSpecification childWidthMeasureSpec = GetChildMeasureSpecification(widthMeasureSpec, new LayoutLength(childLayout.Owner.Padding.Start + childLayout.Owner.Padding.End),
+                        MeasureSpecification childWidthMeasureSpec = GetChildMeasureSpecification(widthMeasureSpec, new LayoutLength(childLayout.Padding.Start + childLayout.Padding.End),
                                                                      new LayoutLength(LayoutParamPolicies.WrapContent) );
-                        MeasureSpecification childHeightMeasureSpec = GetChildMeasureSpecification(heightMeasureSpec, new LayoutLength(childLayout.Owner.Padding.Top + childLayout.Owner.Padding.Bottom),
+                        MeasureSpecification childHeightMeasureSpec = GetChildMeasureSpecification(heightMeasureSpec, new LayoutLength(childLayout.Padding.Top + childLayout.Padding.Bottom),
                                                                      childDesiredHeight);
                          childLayout.Measure( childWidthMeasureSpec, childHeightMeasureSpec);
                          usedExcessSpace += childLayout.MeasuredWidth.Size;
@@ -272,7 +265,7 @@ namespace Tizen.NUI
                  }
              } // foreach
  
-            Extents padding = Owner.Padding;
+            Extents padding = Padding;
              _totalLength += padding.Start + padding.End;
              LayoutLength widthSize = new LayoutLength(_totalLength);
              widthSize = new LayoutLength( Math.Max( widthSize.AsDecimal(), SuggestedMinimumWidth.AsDecimal()));
@@ -324,21 +317,13 @@ namespace Tizen.NUI
              // to accumulate total used space in mTotalLength based on measured sizes and margins.
              // Weighted children are not measured at this phase.
              // Available space for weighted children will be calculated in the phase 2 based on mTotalLength value.
-
-            Log.Info("NUI", "Measuring Vertical[" + _children.Count + "] child with parent width mode:" + widthMode + ",height mode:" + heightMode + "\n");
-
              uint index = 0;
              foreach( LayoutItem childLayout in _children )
              {
                  LayoutLength childDesiredWidth = new LayoutLength(childLayout.Owner.WidthSpecification);
                  LayoutLength childDesiredHeight = new LayoutLength(childLayout.Owner.HeightSpecification);
                  float childWeight = childLayout.Owner.Weight;
-                Extents childMargin = childLayout.Owner.Margin;
-                Log.Info("NUI", "Retrieved parameters for child:" + childLayout.Owner.Name
-                                + " desiredWidth: " + childDesiredWidth.AsRoundedValue()
-                                + " desiredHeight:" + childDesiredHeight.AsRoundedValue()
-                                + " childWeight:" + childWeight + "\n");
-
+                Extents childMargin = childLayout.Margin;
                  totalWeight += childWeight;
  
                  bool useExcessSpace = (childDesiredHeight.AsRoundedValue() == 0) && (childWeight > 0);
@@ -359,10 +344,10 @@ namespace Tizen.NUI
                          // optimal height. We'll restore the original height of 0
                          // after measurement.
                          MeasureSpecification childWidthMeasureSpec = GetChildMeasureSpecification( widthMeasureSpec,
-                                                                    new LayoutLength(childLayout.Owner.Padding.Start + childLayout.Owner.Padding.End),
+                                                                    new LayoutLength(childLayout.Padding.Start + childLayout.Padding.End),
                                                                      childDesiredWidth);
                          MeasureSpecification childHeightMeasureSpec = GetChildMeasureSpecification( heightMeasureSpec,
-                                                                      new LayoutLength(childLayout.Owner.Padding.Top + childLayout.Owner.Padding.Bottom),
+                                                                      new LayoutLength(childLayout.Padding.Top + childLayout.Padding.Bottom),
                                                                        new LayoutLength(LayoutParamPolicies.WrapContent) );
                          childLayout.Measure( childWidthMeasureSpec, childHeightMeasureSpec );
                          childHeight = childLayout.MeasuredHeight.Size;
@@ -392,7 +377,7 @@ namespace Tizen.NUI
                      matchWidthLocally = true;
                  }
  
-                float marginWidth = (childLayout.Owner.Margin.Start) + (childLayout.Owner.Margin.End);
+                float marginWidth = (childLayout.Margin.Start) + (childLayout.Margin.End);
                  LayoutLength childWidth = new LayoutLength(childLayout.MeasuredWidth.Size.AsDecimal() + marginWidth);
  
                  // was combineMeasuredStates()
@@ -428,7 +413,7 @@ namespace Tizen.NUI
              } // foreach
  
  
-            Extents padding = Owner.Padding;
+            Extents padding = Padding;
              _totalLength += padding.Top + padding.Bottom;
              LayoutLength heightSize = new LayoutLength(_totalLength);
              heightSize = new LayoutLength(Math.Max( heightSize.AsDecimal(), SuggestedMinimumHeight.AsDecimal() ));
@@ -457,7 +442,7 @@ namespace Tizen.NUI
                      int desiredWidth = childLayout.Owner.WidthSpecification;
                      int desiredHeight = childLayout.Owner.HeightSpecification;
                      float childWeight = childLayout.Owner.Weight;
-                    Extents childMargin = childLayout.Owner.Margin;
+                    Extents childMargin = childLayout.Margin;
  
                      float childHeight = 0;
                      if( childWeight > 0 )
@@ -482,7 +467,7 @@ namespace Tizen.NUI
                          }
  
                          MeasureSpecification childWidthMeasureSpec = GetChildMeasureSpecification( widthMeasureSpec,
-                                            new LayoutLength(Owner.Padding.Start + Owner.Padding.End),
+                                            new LayoutLength(Padding.Start + Padding.End),
                                              new LayoutLength(desiredWidth) );
  
                          MeasureSpecification childHeightMeasureSpec = new MeasureSpecification( new LayoutLength(childHeight), MeasureSpecification.ModeType.Exactly);
@@ -523,7 +508,7 @@ namespace Tizen.NUI
                  } // foreach
  
                  // Add in our padding
-                _totalLength += Owner.Padding.Top + Owner.Padding.Bottom;
+                _totalLength += Padding.Top + Padding.Bottom;
              }
              else
              {
@@ -550,18 +535,16 @@ namespace Tizen.NUI
  
          void LayoutHorizontal(LayoutLength left, LayoutLength top, LayoutLength right, LayoutLength bottom)
          {
-            Log.Info("NUI", "left,top,right,bottom:" + left.AsRoundedValue() + "," + top.AsRoundedValue()
-                                                     + " " + right .AsRoundedValue() + "," + bottom.AsRoundedValue() + "\n");
              bool isLayoutRtl = Owner.LayoutDirection == ViewLayoutDirectionType.RTL;
  
-            LayoutLength childTop = new LayoutLength(Owner.Padding.Top);
-            LayoutLength childLeft = new LayoutLength(Owner.Padding.Start);
+            LayoutLength childTop = new LayoutLength(Padding.Top);
+            LayoutLength childLeft = new LayoutLength(Padding.Start);
  
              // Where bottom of child should go
              LayoutLength height = new LayoutLength(bottom - top);
  
              // Space available for child
-            LayoutLength childSpace = new LayoutLength( height - Owner.Padding.Top - Owner.Padding.Bottom);
+            LayoutLength childSpace = new LayoutLength( height - Padding.Top - Padding.Bottom);
  
              int count = _children.Count;
  
@@ -573,11 +556,11 @@ namespace Tizen.NUI
                      // In case of RTL map BEGIN alignment to the right edge
                      if (isLayoutRtl)
                      {
-                        childLeft = new LayoutLength(Owner.Padding.Start  + right.AsDecimal() - left.AsDecimal() - _totalLength);
+                        childLeft = new LayoutLength(Padding.Start  + right.AsDecimal() - left.AsDecimal() - _totalLength);
                      }
                      else
                      {
-                        childLeft = new LayoutLength(Owner.Padding.Start);
+                        childLeft = new LayoutLength(Padding.Start);
                      }
                      break;
                  case Alignment.End:
@@ -585,16 +568,16 @@ namespace Tizen.NUI
                      // In case of RTL map END alignment to the left edge
                      if (isLayoutRtl)
                      {
-                        childLeft = new LayoutLength(Owner.Padding.Start);
+                        childLeft = new LayoutLength(Padding.Start);
                      }
                      else
                      {
-                        childLeft = new LayoutLength(Owner.Padding.Start + right.AsDecimal() - left.AsDecimal() - _totalLength);
+                        childLeft = new LayoutLength(Padding.Start + right.AsDecimal() - left.AsDecimal() - _totalLength);
                      }
                      break;
                  case Alignment.CenterHorizontal:
                      // totalLength contains the padding already
-                    childLeft = new LayoutLength(Owner.Padding.Start + (right.AsDecimal() - left.AsDecimal() - _totalLength) / 2.0f);
+                    childLeft = new LayoutLength(Padding.Start + (right.AsDecimal() - left.AsDecimal() - _totalLength) / 2.0f);
                      break;
              }
  
@@ -617,19 +600,19 @@ namespace Tizen.NUI
                  {
                      LayoutLength childWidth = childLayout.MeasuredWidth.Size;
                      LayoutLength childHeight = childLayout.MeasuredHeight.Size;
-                    Extents childMargin = childLayout.Owner.Margin;
+                    Extents childMargin = childLayout.Margin;
  
                      switch ( LinearAlignment )
                      {
                          case Alignment.Top:
-                            childTop = new LayoutLength(Owner.Padding.Top + childMargin.Top);
+                            childTop = new LayoutLength(Padding.Top + childMargin.Top);
                              break;
                          case Alignment.Bottom:
-                            childTop = new LayoutLength(height - Owner.Padding.Bottom - childHeight - childMargin.Bottom);
+                            childTop = new LayoutLength(height - Padding.Bottom - childHeight - childMargin.Bottom);
                              break;
                          case Alignment.CenterVertical: // FALLTHROUGH
                          default:
-                            childTop = new LayoutLength(Owner.Padding.Top + ( ( childSpace - childHeight ).AsDecimal() / 2.0f ) + childMargin.Top - childMargin.Bottom);
+                            childTop = new LayoutLength(Padding.Top + ( ( childSpace - childHeight ).AsDecimal() / 2.0f ) + childMargin.Top - childMargin.Bottom);
                              break;
                      }
                      childLeft += childMargin.Start;
@@ -641,17 +624,14 @@ namespace Tizen.NUI
  
          void LayoutVertical(LayoutLength left, LayoutLength top, LayoutLength right, LayoutLength bottom)
          {
-            Log.Info("NUI", "left,top,right,bottom:" + left.AsRoundedValue() + "," + top.AsRoundedValue()
-                                                     + " " + right .AsRoundedValue() + "," + bottom.AsRoundedValue() + "\n");
-
-            LayoutLength childTop = new LayoutLength(Owner.Padding.Top);
-            LayoutLength childLeft = new LayoutLength(Owner.Padding.Start);
+            LayoutLength childTop = new LayoutLength(Padding.Top);
+            LayoutLength childLeft = new LayoutLength(Padding.Start);
  
              // Where end of child should go
              LayoutLength width = new LayoutLength(right - left);
  
              // Space available for child
-            LayoutLength childSpace = new LayoutLength( width - Owner.Padding.Start - Owner.Padding.End);
+            LayoutLength childSpace = new LayoutLength( width - Padding.Start - Padding.End);
  
              int count = _children.Count;
  
@@ -659,16 +639,16 @@ namespace Tizen.NUI
              {
                case Alignment.Top:
                  // totalLength contains the padding already
-                childTop = new LayoutLength( Owner.Padding.Top );
+                childTop = new LayoutLength( Padding.Top );
                  break;
                case Alignment.Bottom:
                  // totalLength contains the padding already
-                childTop = new LayoutLength( Owner.Padding.Top + bottom.AsDecimal() - top.AsDecimal() - _totalLength);
+                childTop = new LayoutLength( Padding.Top + bottom.AsDecimal() - top.AsDecimal() - _totalLength);
                  break;
                case Alignment.CenterVertical:
                default:
                  // totalLength contains the padding already
-                childTop = new LayoutLength(Owner.Padding.Top + ( bottom.AsDecimal() - top.AsDecimal() - _totalLength ) / 2.0f);
+                childTop = new LayoutLength(Padding.Top + ( bottom.AsDecimal() - top.AsDecimal() - _totalLength ) / 2.0f);
                  break;
              }
  
@@ -679,7 +659,7 @@ namespace Tizen.NUI
                  {
                      LayoutLength childWidth = childLayout.MeasuredWidth.Size;
                      LayoutLength childHeight = childLayout.MeasuredHeight.Size;
-                    Extents childMargin = childLayout.Owner.Margin;
+                    Extents childMargin = childLayout.Margin;
  
                      childTop += childMargin.Top;
                      switch ( LinearAlignment )
@@ -687,17 +667,17 @@ namespace Tizen.NUI
                        case Alignment.Begin:
                        default:
                        {
-                        childLeft = new LayoutLength( Owner.Padding.Start + childMargin.Start);
+                        childLeft = new LayoutLength(Padding.Start + childMargin.Start);
                          break;
                        }
                        case Alignment.End:
                        {
-                        childLeft = new LayoutLength(width - Owner.Padding.End - childWidth - childMargin.End);
+                        childLeft = new LayoutLength(width - Padding.End - childWidth - childMargin.End);
                          break;
                        }
                        case Alignment.CenterHorizontal:
                        {
-                        childLeft = new LayoutLength(Owner.Padding.Start + (( childSpace - childWidth ).AsDecimal() / 2.0f) + childMargin.Start - childMargin.End);
+                        childLeft = new LayoutLength(Padding.Start + (( childSpace - childWidth ).AsDecimal() / 2.0f) + childMargin.Start - childMargin.End);
                          break;
                        }
                      }
diff --git a/src/Tizen.NUI/src/internal/Xaml/XamlLoader.cs b/src/Tizen.NUI/src/internal/Xaml/XamlLoader.cs

index 758a45f..912886e 100755 (executable)
--- a/src/Tizen.NUI/src/internal/Xaml/XamlLoader.cs
+++ b/src/Tizen.NUI/src/internal/Xaml/XamlLoader.cs
@@ -204,6 +204,8 @@ namespace Tizen.NUI.Xaml
              {
                  StreamReader reader = new StreamReader(animationXamlPath);
                  xaml = reader.ReadToEnd();
+                reader.Close();
+                reader.Dispose();
                  Tizen.Log.Fatal("NUI", "File is exist!, try with xaml: " + xaml);
                  return xaml;
              }
@@ -236,6 +238,8 @@ namespace Tizen.NUI.Xaml
              {
                  StreamReader reader = new StreamReader(likelyResourcePath);
                  xaml = reader.ReadToEnd();
+                reader.Close();
+                reader.Dispose();
                  Tizen.Log.Fatal("NUI", "File is exist!, try with xaml: " + xaml);
                  var pattern = String.Format("x:Class *= *\"{0}\"", type.FullName);
                  var regex = new Regex(pattern, RegexOptions.ECMAScript);
diff --git a/src/Tizen.NUI/src/internal/XamlBinding/RotationTypeConverter.cs b/src/Tizen.NUI/src/internal/XamlBinding/RotationTypeConverter.cs

index 9aa8454..c75af23 100755 (executable)
--- a/src/Tizen.NUI/src/internal/XamlBinding/RotationTypeConverter.cs
+++ b/src/Tizen.NUI/src/internal/XamlBinding/RotationTypeConverter.cs
@@ -10,7 +10,7 @@ namespace Tizen.NUI.Binding
              // public Rotation(Radian radian(float), Vector3 vector3)
              // Default: <View Orientation="45.0,12,13,0" />
              // Oritation="D:23, 0, 0, 1"
-            // Oritation="R:23, 0, 0, 1" 
+            // Oritation="R:23, 0, 0, 1"
              if (value != null)
              {
                  string[] parts = value.Split(',');
@@ -41,7 +41,7 @@ namespace Tizen.NUI.Binding
  
                      if (useDefault)
                      {
-                        //Default: <View Orientation="45.0,12,13,0" />
+                        // Default: <View Orientation="45.0,12,13,0" />
                          radian = new Radian( Single.Parse( parts[0].Trim(), CultureInfo.InvariantCulture ) );
                      }
  
diff --git a/src/Tizen.NUI/src/public/BaseComponents/TextField.cs b/src/Tizen.NUI/src/public/BaseComponents/TextField.cs

index 3e4ce7f..4553a9a 100755 (executable)
--- a/src/Tizen.NUI/src/public/BaseComponents/TextField.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/TextField.cs
@@ -255,7 +255,40 @@ namespace Tizen.NUI.BaseComponents
              Tizen.NUI.Object.GetProperty(textField.swigCPtr, TextField.Property.PLACEHOLDER_TEXT_COLOR).Get(temp);
              return temp;
          });
-
+        /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API.
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public static readonly BindableProperty EnableGrabHandleProperty = BindableProperty.Create(nameof(TextField.EnableGrabHandle), typeof(bool), typeof(TextField), true, propertyChanged: (bindable, oldValue, newValue) =>
+        {
+            var textField = (TextField)bindable;
+            if (newValue != null)
+            {
+                Tizen.NUI.Object.SetProperty(textField.swigCPtr, TextField.Property.ENABLE_GRAB_HANDLE, new Tizen.NUI.PropertyValue((bool)newValue));
+            }
+        },
+        defaultValueCreator: (bindable) =>
+        {
+            var textField = (TextField)bindable;
+            bool temp = false;
+            Tizen.NUI.Object.GetProperty(textField.swigCPtr, TextField.Property.ENABLE_GRAB_HANDLE).Get(out temp);
+            return temp;
+        });
+        /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API.
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public static readonly BindableProperty EnableGrabHandlePopupProperty = BindableProperty.Create(nameof(TextField.EnableGrabHandlePopup), typeof(bool), typeof(TextField), true, propertyChanged: (bindable, oldValue, newValue) =>
+        {
+            var textField = (TextField)bindable;
+            if (newValue != null)
+            {
+                Tizen.NUI.Object.SetProperty(textField.swigCPtr, TextField.Property.ENABLE_GRAB_HANDLE_POPUP, new Tizen.NUI.PropertyValue((bool)newValue));
+            }
+        },
+        defaultValueCreator: (bindable) =>
+        {
+            var textField = (TextField)bindable;
+            bool temp = false;
+            Tizen.NUI.Object.GetProperty(textField.swigCPtr, TextField.Property.ENABLE_GRAB_HANDLE_POPUP).Get(out temp);
+            return temp;
+        });
          /// 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 static readonly BindableProperty PrimaryCursorColorProperty = BindableProperty.Create(nameof(TextField.PrimaryCursorColor), typeof(Vector4), typeof(TextField), null, propertyChanged: (bindable, oldValue, newValue) =>
@@ -1918,6 +1951,44 @@ namespace Tizen.NUI.BaseComponents
          }
  
          /// <summary>
+        /// The Enable selection property.
+        /// </summary>
+        /// <since_tizen> 5.5 </since_tizen>
+        /// This will be released at Tizen.NET API Level 5, so currently this would be used as inhouse API.
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool EnableGrabHandle
+        {
+            get
+            {
+                return (bool)GetValue(EnableGrabHandleProperty);
+            }
+            set
+            {
+                SetValue(EnableGrabHandleProperty, value);
+                NotifyPropertyChanged();
+            }
+        }
+
+        /// <summary>
+        /// The Enable selection property.
+        /// </summary>
+        /// <since_tizen> 5.5 </since_tizen>
+        /// This will be released at Tizen.NET API Level 5, so currently this would be used as inhouse API.
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool EnableGrabHandlePopup
+        {
+            get
+            {
+                return (bool)GetValue(EnableGrabHandlePopupProperty);
+            }
+            set
+            {
+                SetValue(EnableGrabHandlePopupProperty, value);
+                NotifyPropertyChanged();
+            }
+        }
+
+        /// <summary>
          /// The Placeholder property.
          /// Gets or sets the placeholder: text, color, font family, font style, point size, and pixel size.
          /// </summary>
@@ -2046,6 +2117,18 @@ namespace Tizen.NUI.BaseComponents
              return inputMethodCotext;
          }
  
+        /// <summary>
+        /// Select the whole text.
+        /// </summary>
+        /// <since_tizen> 5.5 </since_tizen>
+        /// This will be released at Tizen.NET API Level 5.5, so currently this would be used as inhouse API.
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void SelectWholeText()
+        {
+            Interop.TextField.TextField_SelectWholeText(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
          internal static global::System.Runtime.InteropServices.HandleRef getCPtr(TextField obj)
          {
              return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
@@ -2286,6 +2369,8 @@ namespace Tizen.NUI.BaseComponents
              internal static readonly int ELLIPSIS = Interop.TextField.TextField_Property_ELLIPSIS_get();
              internal static readonly int ENABLE_SHIFT_SELECTION = Interop.TextField.TextField_Property_ENABLE_SHIFT_SELECTION_get();
              internal static readonly int MATCH_SYSTEM_LANGUAGE_DIRECTION = Interop.TextField.TextField_Property_MATCH_SYSTEM_LANGUAGE_DIRECTION_get();
+            internal static readonly int ENABLE_GRAB_HANDLE = Interop.TextField.TextField_Property_ENABLE_GRAB_HANDLE_get();
+            internal static readonly int ENABLE_GRAB_HANDLE_POPUP = Interop.TextField.TextField_Property_ENABLE_GRAB_HANDLE_POPUP_get();
          }
  
          internal class InputStyle
diff --git a/src/Tizen.NUI/src/public/BaseComponents/View.cs b/src/Tizen.NUI/src/public/BaseComponents/View.cs

index 56a4fee..1a52319 100755 (executable)
--- a/src/Tizen.NUI/src/public/BaseComponents/View.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/View.cs
@@ -3090,11 +3090,35 @@ namespace Tizen.NUI.BaseComponents
          {
              get
              {
-                return (Extents)GetValue(PaddingProperty);
+                // If View has a Layout then padding in stored in the base Layout class
+                if (Layout !=null)
+                {
+                    return Layout.Padding;
+                }
+                else
+                {
+                    return (Extents)GetValue(PaddingProperty);
+                }
+                // Two return points to prevent creating a zeroed Extent native object before assignment
              }
              set
              {
-                SetValue(PaddingProperty, value);
+                Extents padding = value;
+                if (Layout !=null)
+                {
+                    // Layout set so store Padding in LayoutItem instead of in View.
+                    // If View stores the Padding value then Legacy Size Negotiation will overwrite
+                    // the position and sizes measure in the Layouting.
+                    Layout.Padding = value;
+                    // If Layout is a LayoutItem then it could be a View that handles it's own padding.
+                    // Let the View keeps it's padding.  Still store Padding in Layout to reduce code paths.
+                    if( Layout.GetType() != typeof(LayoutItem)) // If a Layout container of some kind.
+                    {
+                        padding =  new Extents(0,0,0,0); // Reset value stored in View.
+                    }
+                    _layout?.RequestLayout();
+                }
+                SetValue(PaddingProperty, padding);
                  NotifyPropertyChanged();
                  _layout?.RequestLayout();
              }
@@ -3342,11 +3366,33 @@ namespace Tizen.NUI.BaseComponents
          {
              get
              {
-                return (Extents)GetValue(MarginProperty);
+                // If View has a Layout then margin is stored in Layout.
+                if (Layout != null)
+                {
+                    return Layout.Margin;
+                }
+                else
+                {
+                    // If Layout not set then return margin stored in View.
+                    return (Extents)GetValue(MarginProperty);
+                }
+                // Two return points to prevent creating a zeroed Extent native object before assignment
              }
              set
              {
-                SetValue(MarginProperty, value);
+                if (Layout != null)
+                {
+                    // Layout set so store Margin in LayoutItem instead of View.
+                    // If View stores the Margin too then the Legacy Size Negotiation will
+                    // overwrite the position and size values measured in the Layouting.
+                    Layout.Margin = value;
+                    SetValue(MarginProperty, new Extents(0,0,0,0));
+                    _layout?.RequestLayout();
+                }
+                else
+                {
+                    SetValue(MarginProperty, value);
+                }
                  NotifyPropertyChanged();
                  _layout?.RequestLayout();
              }
@@ -3398,6 +3444,7 @@ namespace Tizen.NUI.BaseComponents
              }
          }
  
+
          /// <summary>
          /// [Obsolete("Please do not use! this will be deprecated")]
          /// </summary>
@@ -3608,11 +3655,59 @@ namespace Tizen.NUI.BaseComponents
  
                  // If new layout being set already has a owner then that owner receives a replacement default layout.
                  // First check if the layout to be set already has a owner.
-                if ( value.Owner != null )
+                if (value?.Owner != null)
                  {
                      Log.Info("NUI", "Set layout already in use by another View: " + value.Owner.Name + "will get a LayoutGroup\n");
                      // Previous owner of the layout gets a default layout as a replacement.
                      value.Owner.Layout = new LayoutGroup();
+
+                    // Copy Margin and Padding to replacement LayoutGroup.
+                    value.Owner.Layout.Margin = value.Margin;
+                    value.Owner.Layout.Padding = value.Padding;
+                }
+
+                // Copy Margin and Padding to new layout being set or restore padding and margin back to
+                // View if no replacement. Previously margin and padding values would have been moved from
+                // the View to the layout.
+                if (_layout != null ) // Existing layout
+                {
+                    if (value != null)
+                    {
+                        // Existing layout being replaced so copy over margin and padding values.
+                        value.Margin = _layout.Margin;
+                        value.Padding = _layout.Padding;
+                    }
+                    else
+                    {
+                      // Layout not being replaced so restore margin and padding to View.
+                      SetValue(MarginProperty, _layout.Margin);
+                      SetValue(PaddingProperty, _layout.Padding);
+                      NotifyPropertyChanged();
+                    }
+                }
+                else
+                {
+                    // First Layout to be added to the View hence copy
+
+                    // Do not try to set Margins or Padding on a null Layout (when a layout is being removed from a View)
+                    if (value !=null)
+                    {
+                        if (Margin.Top != 0 || Margin.Bottom !=0 || Margin.Start !=0 || Margin.End != 0)
+                        {
+                            // If View already has a margin set then store it in Layout instead.
+                            value.Margin = Margin;
+                            SetValue(MarginProperty, new Extents(0,0,0,0));
+                            NotifyPropertyChanged();
+                        }
+
+                        if (Padding.Top != 0 || Padding.Bottom !=0 || Padding.Start !=0 || Padding.End != 0)
+                        {
+                            // If View already has a padding set then store it in Layout instead.
+                            value.Padding = Padding;
+                            SetValue(PaddingProperty, new Extents(0,0,0,0));
+                            NotifyPropertyChanged();
+                        }
+                    }
                  }
  
                  // Remove existing layout from it's parent layout group.
@@ -3626,8 +3721,8 @@ namespace Tizen.NUI.BaseComponents
          internal void SetLayout(LayoutItem layout)
          {
              _layout = layout;
-            _layout.AttachToOwner(this);
-            _layout.RequestLayout();
+            _layout?.AttachToOwner(this);
+            _layout?.RequestLayout();
          }
  
          /// <summary>
author	huiyueun <35286162+huiyueun@users.noreply.github.com>
	Thu, 9 May 2019 07:08:14 +0000 (16:08 +0900)
committer	dongsug-song <35130733+dongsug-song@users.noreply.github.com>
	Thu, 9 May 2019 07:08:14 +0000 (16:08 +0900)
packaging/csapi-tizenfx.spec		patch \| blob \| history
src/Tizen.NUI/src/internal/FriendAssembly.cs		patch \| blob \| history
src/Tizen.NUI/src/internal/Interop/Interop.TextField.cs		patch \| blob \| history
src/Tizen.NUI/src/internal/Interop/NDalicPINVOKE.cs		patch \| blob \| history
src/Tizen.NUI/src/internal/Layouting/AbsoluteLayout.cs		patch \| blob \| history
src/Tizen.NUI/src/internal/Layouting/GridLayout.cs		patch \| blob \| history
src/Tizen.NUI/src/internal/Layouting/GridLocations.cs		patch \| blob \| history
src/Tizen.NUI/src/internal/Layouting/LayoutController.cs		patch \| blob \| history
src/Tizen.NUI/src/internal/Layouting/LayoutGroup.cs		patch \| blob \| history
src/Tizen.NUI/src/internal/Layouting/LayoutItem.cs		patch \| blob \| history
src/Tizen.NUI/src/internal/Layouting/LinearLayout.cs		patch \| blob \| history
src/Tizen.NUI/src/internal/Xaml/XamlLoader.cs		patch \| blob \| history
src/Tizen.NUI/src/internal/XamlBinding/RotationTypeConverter.cs		patch \| blob \| history
src/Tizen.NUI/src/public/BaseComponents/TextField.cs		patch \| blob \| history
src/Tizen.NUI/src/public/BaseComponents/View.cs		patch \| blob \| history