[NUI] Fix Svace issues
authorzhouleonlei <zhouleon.lei@samsung.com>
Thu, 26 Nov 2020 08:17:24 +0000 (16:17 +0800)
committerdongsug-song <35130733+dongsug-song@users.noreply.github.com>
Tue, 1 Dec 2020 08:56:39 +0000 (17:56 +0900)
src/Tizen.NUI.Components/Controls/Pagination.cs
src/Tizen.NUI.Components/Controls/RecyclerView/RecyclerView.cs
src/Tizen.NUI.Components/Controls/ScrollableBase.cs

index ff4ab1ba64a81aa3133d97f0c7e352df3f8ff8c6..e6d57cb14a29c5cb336a28b9d0965f3443f0910a 100755 (executable)
@@ -473,7 +473,7 @@ namespace Tizen.NUI.Components
             }
             ImageVisual indicator = new ImageVisual
             {
-                URL = paginationStyle.IndicatorImageUrl.Normal,
+                URL = paginationStyle.IndicatorImageUrl?.Normal,
                 Size = new Size2D((int)paginationStyle.IndicatorSize.Width, (int)paginationStyle.IndicatorSize.Height),
                 //TODO: Apply color properties from PaginationStyle class.
                 MixColor = (indicatorColor == null) ? new Color(1.0f, 1.0f, 1.0f, 0.5f) : indicatorColor,
@@ -511,7 +511,7 @@ namespace Tizen.NUI.Components
             for (int i = 0; i < indicatorList.Count; i++)
             {
                 ImageVisual indicator = indicatorList[i];
-                indicator.URL = paginationStyle.IndicatorImageUrl.Normal;
+                indicator.URL = paginationStyle.IndicatorImageUrl?.Normal;
                 indicator.Size = new Size2D((int)paginationStyle.IndicatorSize.Width, (int)paginationStyle.IndicatorSize.Height);
                 indicator.Position = new Vector2((int)(paginationStyle.IndicatorSize.Width + paginationStyle.IndicatorSpacing) * i, 0);
             }
index 0e9444c6a741279e61669a3579b6e5522f4c681e..6cd77792c922e1989b5c7fb1f84bc985c7ace6e5 100755 (executable)
@@ -278,7 +278,7 @@ namespace Tizen.NUI.Components
                 }
             }
 
-            if (nextFocusedView)
+            if (nextFocusedView != null)
             {
                 // Check next focused view is inside of visible area.
                 // If it is not, move scroll position to make it visible.
index 80aafaed0a1067bb1fb26802ec084eeb27202fa1..e0c105c378b23633a6b2d269a50c11fa504ce7a4 100755 (executable)
@@ -180,8 +180,11 @@ namespace Tizen.NUI.Components
                     ResolveSizeAndState(new LayoutLength(totalHeight), heightMeasureSpec, childHeightState));
 
                 // Size of ScrollableBase is changed. Change Page width too.
-                scrollableBase.mPageWidth = (int)MeasuredWidth.Size.AsRoundedValue();
-                scrollableBase.OnScrollingChildRelayout(null, null);
+                if (scrollableBase != null)
+                {
+                    scrollableBase.mPageWidth = (int)MeasuredWidth.Size.AsRoundedValue();
+                    scrollableBase.OnScrollingChildRelayout(null, null);
+                }
             }
 
             protected override void OnLayout(bool changed, LayoutLength left, LayoutLength top, LayoutLength right, LayoutLength bottom)