From e18e3c598d950c95a3f59053e9c71e041ea0932a Mon Sep 17 00:00:00 2001
From: Jeongkyun <jk.pu@samsung.com>
Date: Thu, 28 Feb 2019 13:30:32 +0900
Subject: [PATCH] [CircleScroller]Fix the issue that can't set
 ScrollBarVisibility

---
 .../CircleScrollViewRenderer.cs                        |  8 +++++++-
 .../WearableUIGallery/TC/TCTwoButtonPage.xaml          | 10 +++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/Tizen.Wearable.CircularUI.Forms.Renderer/CircleScrollViewRenderer.cs b/src/Tizen.Wearable.CircularUI.Forms.Renderer/CircleScrollViewRenderer.cs
index 10bdced2..82863f33 100755
--- a/src/Tizen.Wearable.CircularUI.Forms.Renderer/CircleScrollViewRenderer.cs
+++ b/src/Tizen.Wearable.CircularUI.Forms.Renderer/CircleScrollViewRenderer.cs
@@ -65,6 +65,7 @@ protected override void OnElementChanged(ElementChangedEventArgs<CircleScrollVie
             {
                 (e.NewElement as IScrollViewController).ScrollToRequested += OnScrollRequestedAsync;
             }
+
             UpdateAll();
 
             base.OnElementChanged(e);
@@ -88,6 +89,7 @@ protected override void OnElementPropertyChanged(object sender, PropertyChangedE
             {
                 UpdateHorizontalScrollBarVisibility();
             }
+
             base.OnElementPropertyChanged(sender, e);
         }
 
@@ -116,11 +118,15 @@ protected override void Dispose(bool disposing)
         void UpdateAll()
         {
             UpdateOrientation();
+            UpdateVerticalScrollBarVisibility();
+            UpdateHorizontalScrollBarVisibility();
         }
 
         void UpdateVerticalScrollBarVisibility()
         {
-            Control.VerticalScrollBarVisiblePolicy = ScrollBarVisibilityToTizen(Element.VerticalScrollBarVisibility);
+            var orientation = Element.Orientation;
+            if (orientation == ScrollOrientation.Vertical || orientation == ScrollOrientation.Both)
+                Control.VerticalScrollBarVisiblePolicy = ScrollBarVisibilityToTizen(Element.VerticalScrollBarVisibility);
         }
 
         void UpdateHorizontalScrollBarVisibility()
diff --git a/test/WearableUIGallery/WearableUIGallery/TC/TCTwoButtonPage.xaml b/test/WearableUIGallery/WearableUIGallery/TC/TCTwoButtonPage.xaml
index f8e8622c..15d46416 100755
--- a/test/WearableUIGallery/WearableUIGallery/TC/TCTwoButtonPage.xaml
+++ b/test/WearableUIGallery/WearableUIGallery/TC/TCTwoButtonPage.xaml
@@ -5,12 +5,16 @@
 	xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
 	xmlns:local="clr-namespace:WearableUIGallery.TC"
 	xmlns:w="clr-namespace:Tizen.Wearable.CircularUI.Forms;assembly=Tizen.Wearable.CircularUI.Forms"
+    w:CircleSurfaceEffectBehavior.RotaryFocusObject="{x:Reference myscroller}"
 	Title="{Binding Title}}">
-	<w:TwoButtonPage.BindingContext>
+    <w:TwoButtonPage.Behaviors>
+        <w:CircleSurfaceEffectBehavior />
+    </w:TwoButtonPage.Behaviors>
+    <w:TwoButtonPage.BindingContext>
 		<local:TCTwoButtonPageViewModel />
 	</w:TwoButtonPage.BindingContext>
 	<w:TwoButtonPage.Content>
-		<ScrollView>
+        <w:CircleScrollView x:Name="myscroller" Orientation="Vertical" VerticalScrollBarVisibility="Never">
 			<StackLayout HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand">
 				<Label
 					HorizontalOptions="FillAndExpand"
@@ -25,7 +29,7 @@
                 <Button AutomationId="changeColor1" Clicked="OnChangeColor1" Text="change color 1" />
                 <Button AutomationId="changeColor2" Clicked="OnChangeColor2" Text="change color 2" />
             </StackLayout>
-		</ScrollView>
+		</w:CircleScrollView>
 	</w:TwoButtonPage.Content>
 	<w:TwoButtonPage.FirstButton>
 		<MenuItem Command="{Binding Command1}" Icon="image/tw_ic_popup_btn_check.png" />