[NUI] Add null pointer check for Scrollbar (#2050)
authorzhouleonlei <56956725+zhouleonlei@users.noreply.github.com>
Wed, 14 Oct 2020 07:30:21 +0000 (15:30 +0800)
committerGitHub <noreply@github.com>
Wed, 14 Oct 2020 07:30:21 +0000 (15:30 +0800)
* [NUI] Add null pointer check for Scrollbar

* [NUI] Modified ScrollBar

Co-authored-by: dongsug-song <35130733+dongsug-song@users.noreply.github.com>
src/Tizen.NUI.Components/Controls/ScrollableBase.cs

index eccde39..37d2b09 100755 (executable)
@@ -334,21 +334,24 @@ namespace Tizen.NUI.Components
                 {
                     scrollBar.Unparent();
                 }
-
                 scrollBar = value;
-                scrollBar.Name = "ScrollBar";
-                base.Add(scrollBar);
 
-                if (hideScrollbar)
-                {
-                    scrollBar.Hide();
-                }
-                else
+                if (scrollBar != null)
                 {
-                    scrollBar.Show();
-                }
+                    scrollBar.Name = "ScrollBar";
+                    base.Add(scrollBar);
 
-                SetScrollbar();
+                    if (hideScrollbar)
+                    {
+                        scrollBar.Hide();
+                    }
+                    else
+                    {
+                        scrollBar.Show();
+                    }
+
+                    SetScrollbar();
+                }
             }
         }
 
@@ -701,7 +704,7 @@ namespace Tizen.NUI.Components
             float contentLength = isHorizontal ? ContentContainer.Size.Width : ContentContainer.Size.Height;
             float currentPosition = isHorizontal ? ContentContainer.CurrentPosition.X : ContentContainer.CurrentPosition.Y;
 
-            scrollBar.Update(contentLength, Math.Abs(currentPosition));
+            scrollBar?.Update(contentLength, Math.Abs(currentPosition));
             CheckPreReachedTargetPosition();
         }