From: Seoyeon2Kim <34738918+Seoyeon2Kim@users.noreply.github.com> Date: Fri, 17 Feb 2023 03:57:02 +0000 (+0900) Subject: [NUI] Fix Slider ValueIndicatorImage and Thumb size (#5002) X-Git-Tag: submit/tizen/20230221.111427~1^2~9 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=92f651d60470dfb7835563ee7140f2dc20de1cb1;p=platform%2Fcore%2Fcsapi%2Ftizenfx.git [NUI] Fix Slider ValueIndicatorImage and Thumb size (#5002) - 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 --- diff --git a/src/Tizen.NUI.Components/Controls/Slider.Internal.cs b/src/Tizen.NUI.Components/Controls/Slider.Internal.cs index d3e785a72..b89efda6d 100755 --- 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 f587dce72..4e82d50a2 100755 --- a/src/Tizen.NUI.Components/Theme/DefaultThemeCommon.cs +++ b/src/Tizen.NUI.Components/Theme/DefaultThemeCommon.cs @@ -273,7 +273,8 @@ namespace Tizen.NUI.Components }, Thumb = new ImageViewStyle() { - Size = new Size(40, 40), + WidthResizePolicy = ResizePolicyType.UseNaturalSize, + HeightResizePolicy = ResizePolicyType.UseNaturalSize, ResourceUrl = new Selector() { Normal = FrameworkInformation.ResourcePath + "IoT_slider_handler_normal.png", @@ -284,7 +285,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), @@ -293,6 +296,7 @@ namespace Tizen.NUI.Components ValueIndicatorText = new TextLabelStyle() { SizeHeight = 24, + WidthResizePolicy = ResizePolicyType.UseNaturalSize, PixelSize = 16, TextColor = new Color("#FF6200"), FontSizeScale = FontSizeScale.UseSystemSetting, diff --git a/test/Tizen.NUI.StyleGuide/Examples/SliderExample.cs b/test/Tizen.NUI.StyleGuide/Examples/SliderExample.cs index 113130a7e..58694ed73 100644 --- 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(); + } + } } }