[NUI] Fix Slider ValueIndicatorImage and Thumb size (#5003)

- Update Slider ValueIndicatorImage / Text to change its size depending
on the content.
- Thumb size uses natural size of its image size.
- Update Slider style guide sample for ValueIndicator

Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>

diff --git a/src/Tizen.NUI.Components/Controls/Slider.Internal.cs b/src/Tizen.NUI.Components/Controls/Slider.Internal.cs
index d3e785a7269e2afdc723c492136c04b221681af4..b89efda6df817aaecc3cd4b44cd5cf82ae942968 100755 (executable)
--- a/src/Tizen.NUI.Components/Controls/Slider.Internal.cs
+++ b/src/Tizen.NUI.Components/Controls/Slider.Internal.cs
@@ -325,9 +325,14 @@ namespace Tizen.NUI.Components
             {
                 valueIndicatorImage = new ImageView()
                 {
-                    WidthResizePolicy = ResizePolicyType.FitToChildren,
-                    HeightResizePolicy = ResizePolicyType.Fixed,
                     AccessibilityHidden = true,
+                    Layout = new LinearLayout()
+                    {
+                        LinearOrientation = LinearLayout.Orientation.Horizontal,
+                        HorizontalAlignment = HorizontalAlignment.Center,
+                        VerticalAlignment = VerticalAlignment.Center,
+                    },
+                    WidthSpecification = LayoutParamPolicies.WrapContent,
                 };
                 if (thumbImage != null)
                 {

diff --git a/src/Tizen.NUI.Components/Theme/DefaultThemeCommon.cs b/src/Tizen.NUI.Components/Theme/DefaultThemeCommon.cs
index e9adaad29fe4e2e7e7c830a341b0b574622095de..371b854c50871ddba202ee14dbd639bda3220558 100755 (executable)
--- a/src/Tizen.NUI.Components/Theme/DefaultThemeCommon.cs
+++ b/src/Tizen.NUI.Components/Theme/DefaultThemeCommon.cs
@@ -266,7 +266,8 @@ namespace Tizen.NUI.Components
                 },
                 Thumb = new ImageViewStyle()
                 {
-                    Size = new Size(40, 40),
+                    WidthResizePolicy = ResizePolicyType.UseNaturalSize,
+                    HeightResizePolicy = ResizePolicyType.UseNaturalSize,
                     ResourceUrl = new Selector<string>()
                     {
                         Normal = FrameworkInformation.ResourcePath + "IoT_slider_handler_normal.png",
@@ -277,7 +278,9 @@ namespace Tizen.NUI.Components
                 },
                 ValueIndicatorImage = new ImageViewStyle()
                 {
-                    Size = new Size(43, 40),
+                    SizeHeight = 40,
+                    WidthResizePolicy = ResizePolicyType.FitToChildren,
+                    Margin = new Extents(8, 8, 0, 0),
                     BorderlineWidth = 1.0f,
                     BorderlineColor = new Color("#FF6200"),
                     BackgroundColor = new Color(1.0f, 1.0f, 1.0f, 0.0f),
@@ -286,6 +289,7 @@ namespace Tizen.NUI.Components
                 ValueIndicatorText = new TextLabelStyle()
                 {
                     SizeHeight = 24,
+                    WidthResizePolicy = ResizePolicyType.UseNaturalSize,
                     PixelSize = 16,
                     TextColor = new Color("#FF6200"),
                 }

diff --git a/test/Tizen.NUI.StyleGuide/Examples/SliderExample.cs b/test/Tizen.NUI.StyleGuide/Examples/SliderExample.cs
index 113130a7e58c09a855b4b4632731bcce46f1968f..58694ed73edb8249562a876c61008ab7ab95ca14 100644 (file)
--- a/test/Tizen.NUI.StyleGuide/Examples/SliderExample.cs
+++ b/test/Tizen.NUI.StyleGuide/Examples/SliderExample.cs
@@ -87,8 +87,10 @@ namespace Tizen.NUI.StyleGuide
                 MaxValue = 100,
                 CurrentValue = 100,
                 WidthSpecification = 300,
+                IsValueShown = true,
             };
             rootContent.Add(completedSlider);
+            completedSlider.ValueChanged += OnValueChanged;
 
             verticalSlider = new Slider()
             {
@@ -102,5 +104,14 @@ namespace Tizen.NUI.StyleGuide
 
             Content = rootContent;
         }
+
+        private void OnValueChanged(object sender, SliderValueChangedEventArgs args)
+        {
+            Slider source = sender as Slider;
+            if (source != null)
+            {
+                source.ValueIndicatorText = args.CurrentValue.ToString();
+            }
+        }
     }
 }