[NUI] Fix NUI svace issue (#2817)
authorhuiyueun <35286162+huiyueun@users.noreply.github.com>
Wed, 31 Mar 2021 09:17:09 +0000 (18:17 +0900)
committerdongsug-song <35130733+dongsug-song@users.noreply.github.com>
Wed, 31 Mar 2021 23:54:43 +0000 (08:54 +0900)
Signed-off-by: huiyu.eun <huiyu.eun@samsung.com>
Co-authored-by: Jiyun Yang <ji.yang@samsung.com>
src/Tizen.NUI.Components/Controls/RecyclerView/CollectionView.cs
src/Tizen.NUI.Components/Controls/RecyclerView/Item/DefaultLinearItem.cs
src/Tizen.NUI/src/internal/Common/PropertyRangeManager.cs
src/Tizen.NUI/src/internal/Layouting/LayoutController.cs

index 85fd918..2a0bf2e 100755 (executable)
@@ -772,11 +772,17 @@ namespace Tizen.NUI.Components
                 switch (SelectionMode)
                 {
                     case ItemSelectionMode.SingleSelection:
-                        if (item.BindingContext == SelectedItem) item.IsSelected = true;
+                        if (item.BindingContext != null && item.BindingContext == SelectedItem)
+                        {
+                            item.IsSelected = true;
+                        }
                         break;
 
                     case ItemSelectionMode.MultipleSelections:
-                        if (SelectedItems?.Contains(item.BindingContext) ?? false) item.IsSelected = true;
+                        if ((item.BindingContext != null) && (SelectedItems?.Contains(item.BindingContext) ?? false))
+                        {
+                            item.IsSelected = true;
+                        }
                         break;
                     case ItemSelectionMode.None:
                         item.IsSelectable = false;
index 13c0e4d..ce3668b 100755 (executable)
@@ -365,7 +365,7 @@ namespace Tizen.NUI.Components
                 RelativeLayout.SetLeftTarget(itemExtra, this);
                 RelativeLayout.SetLeftRelativeOffset(itemExtra, 1.0F);
                 RelativeLayout.SetRightTarget(itemExtra, this);
-                RelativeLayout.SetRightRelativeOffset(itemIcon, 1.0F);
+                RelativeLayout.SetRightRelativeOffset(itemExtra, 1.0F);
                 RelativeLayout.SetTopTarget(itemExtra, this);
                 RelativeLayout.SetTopRelativeOffset(itemExtra, 0.0F);
                 RelativeLayout.SetBottomTarget(itemExtra, this);
index 60d00c9..cd8ee7a 100755 (executable)
@@ -114,7 +114,7 @@ namespace Tizen.NUI
                 if (viewType != null)
                 {
                     NUILog.Debug("getStartPropertyIndex =  " + viewType.Name + "current index " + startEventPropertyIndex);
-                    viewType = viewType.GetTypeInfo().BaseType;
+                    viewType = viewType.GetTypeInfo()?.BaseType;
                 }
             }
 
index 5cd4dee..3e89549 100755 (executable)
@@ -244,14 +244,14 @@ namespace Tizen.NUI
             Vector2 windowSize = window.GetSize();
             float width = windowSize.Width;
             float height = windowSize.Height;
-            // First layer in the Window should be the default layer (index 0 )
-            foreach (Layer layer in window.LayersChildren)
+
+            window.LayersChildren?.ForEach(layer =>
             {
-                foreach (View view in layer.Children)
+                layer?.Children?.ForEach(view =>
                 {
                     FindRootLayouts(view, width, height);
-                }
-            }
+                });
+            });
             windowSize.Dispose();
             windowSize = null;
         }