From 7e67cc6ac7b51f5fbda6c2823d05549def3201e4 Mon Sep 17 00:00:00 2001 From: YeongJong Lee Date: Mon, 22 Jun 2020 13:44:09 +0900 Subject: [PATCH] [NUI] replace viewStlye with Style (#1679) Use `Style` property instead of `viewStyle` field. --- src/Tizen.NUI.Components/Controls/Scrollbar.cs | 30 ++++++++++++++-------- .../src/public/CircularProgress.cs | 22 +++++++++------- .../src/public/CircularScrollbar.cs | 26 +++++++++++++------ .../src/public/CircularSlider.cs | 24 +++++++++-------- 4 files changed, 65 insertions(+), 37 deletions(-) diff --git a/src/Tizen.NUI.Components/Controls/Scrollbar.cs b/src/Tizen.NUI.Components/Controls/Scrollbar.cs index eeb37a4..1c8a359 100644 --- a/src/Tizen.NUI.Components/Controls/Scrollbar.cs +++ b/src/Tizen.NUI.Components/Controls/Scrollbar.cs @@ -36,12 +36,12 @@ namespace Tizen.NUI.Components var instance = ((Scrollbar)bindable); var thickness = (float?)newValue; - ((ScrollbarStyle)instance.viewStyle).TrackThickness = thickness; + instance.Style.TrackThickness = thickness; instance.UpdateTrackThickness(thickness ?? 0); }, defaultValueCreator: (bindable) => { - return ((ScrollbarStyle)((Scrollbar)bindable).viewStyle)?.TrackThickness ?? 0; + return ((Scrollbar)bindable).Style.TrackThickness ?? 0; }); /// Bindable property of ThumbThickness @@ -51,12 +51,12 @@ namespace Tizen.NUI.Components var instance = ((Scrollbar)bindable); var thickness = (float?)newValue; - ((ScrollbarStyle)instance.viewStyle).ThumbThickness = thickness; + instance.Style.ThumbThickness = thickness; instance.UpdateThumbThickness(thickness ?? 0); }, defaultValueCreator: (bindable) => { - return ((ScrollbarStyle)((Scrollbar)bindable).viewStyle)?.ThumbThickness ?? 0; + return ((Scrollbar)bindable).Style.ThumbThickness ?? 0; }); /// Bindable property of TrackColor @@ -66,12 +66,12 @@ namespace Tizen.NUI.Components var instance = ((Scrollbar)bindable); var color = (Color)newValue; - ((ScrollbarStyle)instance.viewStyle).TrackColor = color; + instance.Style.TrackColor = color; instance.UpdateTrackColor(color); }, defaultValueCreator: (bindable) => { - return ((ScrollbarStyle)((Scrollbar)bindable).viewStyle)?.TrackColor; + return ((Scrollbar)bindable).Style.TrackColor; }); /// Bindable property of ThumbColor @@ -81,12 +81,12 @@ namespace Tizen.NUI.Components var instance = ((Scrollbar)bindable); var color = (Color)newValue; - ((ScrollbarStyle)instance.viewStyle).ThumbColor = color; + instance.Style.ThumbColor = color; instance.UpdateThumbColor(color); }, defaultValueCreator: (bindable) => { - return ((ScrollbarStyle)((Scrollbar)bindable).viewStyle)?.ThumbColor; + return ((Scrollbar)bindable).Style.ThumbColor; }); /// Bindable property of TrackPadding @@ -96,12 +96,12 @@ namespace Tizen.NUI.Components var instance = ((Scrollbar)bindable); var trackPadding = (Extents)newValue; - ((ScrollbarStyle)instance.viewStyle).TrackPadding = trackPadding; + instance.Style.TrackPadding = trackPadding; instance.UpdateTrackPadding(trackPadding); }, defaultValueCreator: (bindable) => { - return ((ScrollbarStyle)((Scrollbar)bindable).viewStyle)?.TrackPadding; + return ((Scrollbar)bindable).Style.TrackPadding; }); private ColorVisual trackVisual; @@ -157,6 +157,16 @@ namespace Tizen.NUI.Components #region Properties /// + /// Return a copied Style instance of Scrollbar + /// + /// + /// It returns copied Style instance and changing it does not effect to the Scrollbar. + /// Style setting is possible by using constructor or the function of ApplyStyle(ViewStyle viewStyle) + /// + [EditorBrowsable(EditorBrowsableState.Never)] + public new ScrollbarStyle Style => ViewStyle as ScrollbarStyle; + + /// /// The thickness of the track. /// [EditorBrowsable(EditorBrowsableState.Never)] diff --git a/src/Tizen.NUI.Wearable/src/public/CircularProgress.cs b/src/Tizen.NUI.Wearable/src/public/CircularProgress.cs index 3d2e46b..28304df 100755 --- a/src/Tizen.NUI.Wearable/src/public/CircularProgress.cs +++ b/src/Tizen.NUI.Wearable/src/public/CircularProgress.cs @@ -43,7 +43,7 @@ namespace Tizen.NUI.Wearable }, defaultValueCreator: (bindable) => { - return ((CircularProgressStyle)((CircularProgress)bindable).viewStyle)?.Thickness; + return ((CircularProgress)bindable).Style.Thickness; }); /// Bindable property of MaxValue @@ -113,7 +113,7 @@ namespace Tizen.NUI.Wearable }, defaultValueCreator: (bindable) => { - return ((CircularProgressStyle)((CircularProgress)bindable).viewStyle)?.TrackColor; + return ((CircularProgress)bindable).Style.TrackColor; }); /// Bindable property of ProgressColor @@ -128,7 +128,7 @@ namespace Tizen.NUI.Wearable }, defaultValueCreator: (bindable) => { - return ((CircularProgressStyle)((CircularProgress)bindable).viewStyle)?.ProgressColor; + return ((CircularProgress)bindable).Style.ProgressColor; }); /// Bindable property of IsEnabled @@ -159,12 +159,6 @@ namespace Tizen.NUI.Wearable private Animation sweepAngleAnimation; - /// - /// Get style of progress. - /// - [EditorBrowsable(EditorBrowsableState.Never)] - public new CircularProgressStyle Style => ViewStyle as CircularProgressStyle; - #endregion Fields @@ -209,6 +203,16 @@ namespace Tizen.NUI.Wearable #region Properties /// + /// Return a copied Style instance of CircularProgress + /// + /// + /// It returns copied Style instance and changing it does not effect to the CircularProgress. + /// Style setting is possible by using constructor or the function of ApplyStyle(ViewStyle viewStyle) + /// + [EditorBrowsable(EditorBrowsableState.Never)] + public new CircularProgressStyle Style => ViewStyle as CircularProgressStyle; + + /// /// The thickness of the track and progress. /// [EditorBrowsable(EditorBrowsableState.Never)] diff --git a/src/Tizen.NUI.Wearable/src/public/CircularScrollbar.cs b/src/Tizen.NUI.Wearable/src/public/CircularScrollbar.cs index 1155033..e4d8811 100644 --- a/src/Tizen.NUI.Wearable/src/public/CircularScrollbar.cs +++ b/src/Tizen.NUI.Wearable/src/public/CircularScrollbar.cs @@ -38,12 +38,12 @@ namespace Tizen.NUI.Wearable var instance = ((CircularScrollbar)bindable); var thickness = (float?)newValue; - ((CircularScrollbarStyle)instance.viewStyle).Thickness = thickness; + instance.Style.Thickness = thickness; instance.UpdateVisualThickness(thickness ?? 0); }, defaultValueCreator: (bindable) => { - return ((CircularScrollbarStyle)((CircularScrollbar)bindable).viewStyle)?.Thickness ?? 0; + return ((CircularScrollbar)bindable).Style.Thickness ?? 0; }); /// Bindable property of TrackSweepAngle @@ -53,12 +53,12 @@ namespace Tizen.NUI.Wearable var instance = ((CircularScrollbar)bindable); var angle = (float?)newValue; - ((CircularScrollbarStyle)instance.viewStyle).TrackSweepAngle = angle; + instance.Style.TrackSweepAngle = angle; instance.UpdateTrackVisualSweepAngle(angle ?? 0); }, defaultValueCreator: (bindable) => { - return ((CircularScrollbarStyle)((CircularScrollbar)bindable).viewStyle)?.TrackSweepAngle ?? 0; + return ((CircularScrollbar)bindable).Style.TrackSweepAngle ?? 0; }); /// Bindable property of TrackColor @@ -68,12 +68,12 @@ namespace Tizen.NUI.Wearable var instance = ((CircularScrollbar)bindable); var color = (Color)newValue; - ((CircularScrollbarStyle)instance.viewStyle).TrackColor = color; + instance.Style.TrackColor = color; instance.UpdateTrackVisualColor(color); }, defaultValueCreator: (bindable) => { - return ((CircularScrollbarStyle)((CircularScrollbar)bindable).viewStyle)?.TrackColor; + return ((CircularScrollbar)bindable).Style.TrackColor; }); /// Bindable property of ThumbColor @@ -83,12 +83,12 @@ namespace Tizen.NUI.Wearable var instance = ((CircularScrollbar)bindable); var color = (Color)newValue; - ((CircularScrollbarStyle)instance.viewStyle).ThumbColor = color; + instance.Style.ThumbColor = color; instance.UpdateThumbVisualColor(color); }, defaultValueCreator: (bindable) => { - return ((CircularScrollbarStyle)((CircularScrollbar)bindable).viewStyle)?.ThumbColor; + return ((CircularScrollbar)bindable).Style.ThumbColor; }); private ArcVisual trackVisual; @@ -147,6 +147,16 @@ namespace Tizen.NUI.Wearable #region Properties /// + /// Return a copied Style instance of CircularScrollbar + /// + /// + /// It returns copied Style instance and changing it does not effect to the CircularScrollbar. + /// Style setting is possible by using constructor or the function of ApplyStyle(ViewStyle viewStyle) + /// + [EditorBrowsable(EditorBrowsableState.Never)] + public new CircularScrollbarStyle Style => ViewStyle as CircularScrollbarStyle; + + /// /// The thickness of the scrollbar and track. /// [EditorBrowsable(EditorBrowsableState.Never)] diff --git a/src/Tizen.NUI.Wearable/src/public/CircularSlider.cs b/src/Tizen.NUI.Wearable/src/public/CircularSlider.cs index ca8d7de..793d0be 100755 --- a/src/Tizen.NUI.Wearable/src/public/CircularSlider.cs +++ b/src/Tizen.NUI.Wearable/src/public/CircularSlider.cs @@ -43,7 +43,7 @@ namespace Tizen.NUI.Wearable }, defaultValueCreator: (bindable) => { - return ((CircularSliderStyle)((CircularSlider)bindable).viewStyle)?.Thickness; + return ((CircularSlider)bindable).Style.Thickness; }); /// Bindable property of MaxValue @@ -113,7 +113,7 @@ namespace Tizen.NUI.Wearable }, defaultValueCreator: (bindable) => { - return ((CircularSliderStyle)((CircularSlider)bindable).viewStyle)?.TrackColor; + return ((CircularSlider)bindable).Style.TrackColor; }); /// Bindable property of ProgressColor @@ -128,7 +128,7 @@ namespace Tizen.NUI.Wearable }, defaultValueCreator: (bindable) => { - return ((CircularSliderStyle)((CircularSlider)bindable).viewStyle)?.ProgressColor; + return ((CircularSlider)bindable).Style.ProgressColor; }); /// Bindable property of ThumbSize @@ -160,7 +160,7 @@ namespace Tizen.NUI.Wearable }, defaultValueCreator: (bindable) => { - return ((CircularSliderStyle)((CircularSlider)bindable).viewStyle)?.ThumbColor; + return ((CircularSlider)bindable).Style.ThumbColor; }); /// Bindable property of IsEnabled @@ -198,12 +198,6 @@ namespace Tizen.NUI.Wearable private Animation thumbAnimation; /// - /// Get style of progress. - /// - [EditorBrowsable(EditorBrowsableState.Never)] - public new CircularSliderStyle Style => ViewStyle as CircularSliderStyle; - - /// /// Value Changed event data. /// [EditorBrowsable(EditorBrowsableState.Never)] @@ -262,6 +256,16 @@ namespace Tizen.NUI.Wearable #region Properties /// + /// Return a copied Style instance of CircularSlider + /// + /// + /// It returns copied Style instance and changing it does not effect to the CircularSlider. + /// Style setting is possible by using constructor or the function of ApplyStyle(ViewStyle viewStyle) + /// + [EditorBrowsable(EditorBrowsableState.Never)] + public new CircularSliderStyle Style => ViewStyle as CircularSliderStyle; + + /// /// The thickness of the track and progress. /// [EditorBrowsable(EditorBrowsableState.Never)] -- 2.7.4