- Value Indicator is a tooltip of slider.
- Add some properties for value indicator :
IsValueShown, ValueIndicatorText, ValueIndicatorSize, and ValueIndicatorUrl
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
private uint? trackThickness = null;
// the value of the space between track and indicator object
private Extents _spaceBetweenTrackAndIndicator = null;
+ // Whether the value indicator is shown or not
+ private bool isValueShown = false;
+ // the value indicator text
+ private TextLabel valueIndicatorText = null;
+ // the value indicator image object
+ private ImageView valueIndicatorImage = null;
private PanGestureDetector panGestureDetector = null;
private float currentSlidedOffset;
isFocused = false;
isPressed = false;
LayoutDirectionChanged += OnLayoutDirectionChanged;
+
+ panGestureDetector = new PanGestureDetector();
+ panGestureDetector.Attach(this);
+ panGestureDetector.Detected += OnPanGestureDetected;
}
private void OnLayoutDirectionChanged(object sender, LayoutDirectionChangedEventArgs e)
slidedTrackImage.Add(thumbImage);
}
thumbImage.TouchEvent += OnTouchEventForThumb;
-
- panGestureDetector = new PanGestureDetector();
- panGestureDetector.Attach(thumbImage);
- panGestureDetector.Detected += OnPanGestureDetected;
}
return thumbImage;
}
+ private ImageView CreateValueIndicator()
+ {
+ if (null == valueIndicatorImage)
+ {
+ valueIndicatorImage = new ImageView()
+ {
+ PositionUsesPivotPoint = true,
+ ParentOrigin = Tizen.NUI.ParentOrigin.Center,
+ PivotPoint = Tizen.NUI.PivotPoint.Center,
+ WidthResizePolicy = ResizePolicyType.Fixed,
+ HeightResizePolicy = ResizePolicyType.Fixed,
+ };
+ if (valueIndicatorText != null)
+ {
+ valueIndicatorImage.Add(valueIndicatorText);
+ }
+ // TODO : ValueIndicator can be a child of Thumb
+ this.Add(valueIndicatorImage);
+ }
+
+ valueIndicatorImage.Hide();
+ return valueIndicatorImage;
+ }
+
+ private TextLabel CreateValueIndicatorText()
+ {
+ if (null == valueIndicatorText)
+ {
+ valueIndicatorText = new TextLabel()
+ {
+ WidthResizePolicy = ResizePolicyType.Fixed,
+ HeightResizePolicy = ResizePolicyType.Fixed
+ };
+ if (valueIndicatorImage != null)
+ {
+ valueIndicatorImage.Add(valueIndicatorText);
+ }
+ }
+
+ return valueIndicatorText;
+ }
+
private void OnPanGestureDetected(object source, PanGestureDetector.DetectedEventArgs e)
{
if (e.PanGesture.State == Gesture.StateType.Started)
{
currentSlidedOffset = slidedTrackImage.SizeHeight;
}
+
+ if (isValueShown)
+ {
+ valueIndicatorImage.Show();
+ }
+
if (null != sliderSlidingStartedHandler)
{
SliderSlidingStartedEventArgs args = new SliderSlidingStartedEventArgs();
if (e.PanGesture.State == Gesture.StateType.Finished)
{
+ if (isValueShown)
+ {
+ valueIndicatorImage.Hide();
+ }
+
if (null != slidingFinishedHandler)
{
SlidingFinishedArgs args = new SlidingFinishedArgs();
highIndicatorText.PivotPoint = NUI.PivotPoint.CenterRight;
highIndicatorText.PositionUsesPivotPoint = true;
}
+ if (valueIndicatorImage != null)
+ {
+ valueIndicatorImage.ParentOrigin = NUI.ParentOrigin.TopLeft;
+ valueIndicatorImage.PivotPoint = NUI.PivotPoint.BottomCenter;
+ valueIndicatorImage.PositionUsesPivotPoint = true;
+ }
+ if (valueIndicatorText != null)
+ {
+ valueIndicatorText.ParentOrigin = NUI.ParentOrigin.TopCenter;
+ valueIndicatorText.PivotPoint = NUI.PivotPoint.TopCenter;
+ valueIndicatorText.PositionUsesPivotPoint = true;
+ valueIndicatorText.Padding = new Extents(0, 0, 5, 0); // TODO : How to set the text as center
+ }
if (panGestureDetector != null)
{
if (!isInitial)
highIndicatorText.PivotPoint = NUI.PivotPoint.TopCenter;
highIndicatorText.PositionUsesPivotPoint = true;
}
+ if (valueIndicatorImage != null)
+ {
+ valueIndicatorImage.ParentOrigin = NUI.ParentOrigin.BottomCenter;
+ valueIndicatorImage.PivotPoint = NUI.PivotPoint.BottomCenter;
+ valueIndicatorImage.PositionUsesPivotPoint = true;
+ }
+ if (valueIndicatorText != null)
+ {
+ valueIndicatorText.ParentOrigin = NUI.ParentOrigin.TopCenter;
+ valueIndicatorText.PivotPoint = NUI.PivotPoint.TopCenter;
+ valueIndicatorText.PositionUsesPivotPoint = true;
+ valueIndicatorText.Padding = new Extents(0, 0, 5, 0); // TODO : How to set the text as center
+ }
if (panGestureDetector != null)
{
if (!isInitial)
}
float slidedTrackLength = (float)BgTrackLength() * ratio;
slidedTrackImage.Size2D = new Size2D((int)(slidedTrackLength + round), (int)curTrackThickness); //Add const round to reach Math.Round function.
+
+ if (isValueShown)
+ {
+ valueIndicatorImage.Position = new Position(slidedTrackImage.Size2D.Width, 0);
+ }
}
else if (direction == DirectionType.Vertical)
{
float slidedTrackLength = (float)BgTrackLength() * ratio;
slidedTrackImage.Size2D = new Size2D((int)(curTrackThickness + round), (int)slidedTrackLength); //Add const round to reach Math.Round function.
+
+ if (isValueShown)
+ {
+ valueIndicatorImage.Position = new Position(0, -(slidedTrackImage.Size2D.Height + thumbImage.Size.Height / 2));
+ }
}
}
/*
- * Copyright(c) 2019 Samsung Electronics Co., Ltd.
+ * Copyright(c) 2021 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
/// <since_tizen> 6 </since_tizen>
public partial class Slider : Control
{
- /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API.
[EditorBrowsable(EditorBrowsableState.Never)]
public static readonly BindableProperty IndicatorTypeProperty = BindableProperty.Create("IndicatorType", typeof(IndicatorType), typeof(Slider), IndicatorType.None, propertyChanged: (bindable, oldValue, newValue) =>
{
var instance = (Slider)bindable;
return instance.privateIndicatorType;
});
- /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API.
[EditorBrowsable(EditorBrowsableState.Never)]
public static readonly BindableProperty SpaceBetweenTrackAndIndicatorProperty = BindableProperty.Create(nameof(SpaceBetweenTrackAndIndicator), typeof(uint), typeof(Slider), (uint)0, propertyChanged: (bindable, oldValue, newValue) =>
{
var instance = (Slider)bindable;
return instance.privateSpaceBetweenTrackAndIndicator;
});
- /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API.
[EditorBrowsable(EditorBrowsableState.Never)]
public static readonly BindableProperty TrackThicknessProperty = BindableProperty.Create(nameof(TrackThickness), typeof(uint), typeof(Slider), (uint)0, propertyChanged: (bindable, oldValue, newValue) =>
{
var instance = (Slider)bindable;
return instance.privateTrackThickness;
});
+ [EditorBrowsable(EditorBrowsableState.Never)]
+ public static readonly BindableProperty IsValueShownProperty = BindableProperty.Create(nameof(IsValueShown), typeof(bool), typeof(Slider), true, propertyChanged: (bindable, oldValue, newValue) =>
+ {
+ var instance = (Slider)bindable;
+ if (newValue != null)
+ {
+ bool newValueShown = (bool)newValue;
+ if (instance.isValueShown != newValueShown)
+ {
+ instance.isValueShown = newValueShown;
+ }
+ }
+ },
+ defaultValueCreator: (bindable) =>
+ {
+ var instance = (Slider)bindable;
+ return instance.isValueShown;
+ });
+ [EditorBrowsable(EditorBrowsableState.Never)]
+ public static readonly BindableProperty ValueIndicatorTextProperty = BindableProperty.Create(nameof(ValueIndicatorText), typeof(string), typeof(Slider), string.Empty, propertyChanged: (bindable, oldValue, newValue) =>
+ {
+ var instance = (Slider)bindable;
+ if (newValue != null)
+ {
+ string newText = (string)newValue;
+ instance.valueIndicatorText.Text = newText;
+ if (instance.sliderStyle != null)
+ {
+ instance.sliderStyle.ValueIndicatorText.Text = newText;
+ }
+ }
+ },
+ defaultValueCreator: (bindable) =>
+ {
+ var instance = (Slider)bindable;
+ return instance.valueIndicatorText.Text;
+ });
static Slider() { }
result.HighIndicatorImage.CopyPropertiesFromView(highIndicatorImage);
result.LowIndicator.CopyPropertiesFromView(lowIndicatorText);
result.HighIndicator.CopyPropertiesFromView(highIndicatorText);
+ result.ValueIndicatorText.CopyPropertiesFromView(valueIndicatorText);
+ result.ValueIndicatorImage.CopyPropertiesFromView(valueIndicatorImage);
return result;
}
}
}
}
+ /// <summary>
+ /// Flag to decide whether the value indicator is shown
+ /// </summary>
+ /// This will be public opened later after ACR done. Before ACR, need to be hidden as inhouse API.
+ [EditorBrowsable(EditorBrowsableState.Never)]
+ public bool IsValueShown
+ {
+ get
+ {
+ return (bool)GetValue(IsValueShownProperty);
+ }
+ set
+ {
+ SetValue(IsValueShownProperty, value);
+ }
+ }
+
+ /// <summary>
+ /// Gets or sets the text of value indicator.
+ /// </summary>
+ /// This will be public opened later after ACR done. Before ACR, need to be hidden as inhouse API.
+ [EditorBrowsable(EditorBrowsableState.Never)]
+ public string ValueIndicatorText
+ {
+ get
+ {
+ return (string)GetValue(ValueIndicatorTextProperty);
+ }
+ set
+ {
+ SetValue(ValueIndicatorTextProperty, value);
+ }
+ }
+
+ /// <summary>
+ /// Gets or sets the size of the value indicator image object.
+ /// </summary>
+ /// This will be public opened later after ACR done. Before ACR, need to be hidden as inhouse API.
+ [EditorBrowsable(EditorBrowsableState.Never)]
+ public Size ValueIndicatorSize
+ {
+ get
+ {
+ return valueIndicatorImage?.Size;
+ }
+ set
+ {
+ if (null != valueIndicatorImage)
+ {
+ valueIndicatorImage.Size = value;
+ sliderStyle.ValueIndicatorImage.Size = value;
+ }
+ }
+ }
+
+ /// <summary>
+ /// Gets or sets the resource url of the value indicator image object.
+ /// </summary>
+ /// This will be public opened later after ACR done. Before ACR, need to be hidden as inhouse API.
+ [EditorBrowsable(EditorBrowsableState.Never)]
+ public string ValueIndicatorUrl
+ {
+ get
+ {
+ return valueIndicatorImage?.ResourceUrl;
+ }
+ set
+ {
+ if (null != valueIndicatorImage)
+ {
+ valueIndicatorImage.ResourceUrl = value;
+ sliderStyle.ValueIndicatorImage.ResourceUrl = value;
+ }
+ }
+ }
+
private Extents spaceBetweenTrackAndIndicator
{
get
CreateThumb().ApplyStyle(sliderStyle.Thumb);
}
+ if (null != sliderStyle?.ValueIndicatorText)
+ {
+ CreateValueIndicatorText().ApplyStyle(sliderStyle.ValueIndicatorText);
+ }
+
+ if (null != sliderStyle?.ValueIndicatorImage)
+ {
+ CreateValueIndicator().ApplyStyle(sliderStyle.ValueIndicatorImage);
+ }
+
EnableControlStatePropagation = true;
}
{
if (null != panGestureDetector)
{
- if (null != thumbImage)
- {
- panGestureDetector.Detach(thumbImage);
- }
+ panGestureDetector.Detach(this);
panGestureDetector.Detected -= OnPanGestureDetected;
panGestureDetector.Dispose();
panGestureDetector = null;
Utility.Dispose(highIndicatorImage);
Utility.Dispose(lowIndicatorText);
Utility.Dispose(highIndicatorText);
+ Utility.Dispose(valueIndicatorImage);
+ Utility.Dispose(valueIndicatorText);
}
base.Dispose(type);
/// Update Slider by style.
/// </summary>
/// <since_tizen> 6 </since_tizen>
- /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API.
+ /// This will be public opened later after ACR done. Before ACR, need to be hidden as inhouse API.
[EditorBrowsable(EditorBrowsableState.Never)]
protected override void OnUpdate()
{
PointStateType state = e.Touch.GetState(0);
if (state == PointStateType.Down)
{
+ if (isValueShown)
+ {
+ valueIndicatorImage.Show();
+ }
+
Vector2 pos = e.Touch.GetLocalPosition(0);
CalculateCurrentValueByTouch(pos);
UpdateValue();
sliderSlidingFinishedHandler(this, args);
}
}
+ else if (state == PointStateType.Up)
+ {
+ if (isValueShown)
+ {
+ valueIndicatorImage.Hide();
+ }
+ }
return false;
}
{
currentSlidedOffset = bgTrackLength - pos.Y;
}
+
if (bgTrackLength != 0)
{
curValue = ((currentSlidedOffset / (float)bgTrackLength) * (maxValue - minValue)) + minValue;
/*
- * Copyright(c) 2019 Samsung Electronics Co., Ltd.
+ * Copyright(c) 2021 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
/// <since_tizen> 8 </since_tizen>
public class SliderStyle : ControlStyle
{
- /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API.
[EditorBrowsable(EditorBrowsableState.Never)]
public static readonly BindableProperty IndicatorTypeProperty = BindableProperty.Create(nameof(IndicatorType), typeof(IndicatorType?), typeof(SliderStyle), null, propertyChanged: (bindable, oldValue, newValue) =>
{
var instance = (SliderStyle)bindable;
return instance.privateIndicatorType;
});
- /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API.
[EditorBrowsable(EditorBrowsableState.Never)]
public static readonly BindableProperty SpaceBetweenTrackAndIndicatorProperty = BindableProperty.Create(nameof(SpaceBetweenTrackAndIndicator), typeof(uint?), typeof(SliderStyle), null, propertyChanged: (bindable, oldValue, newValue) =>
{
var instance = (SliderStyle)bindable;
return instance.privateSpaceBetweenTrackAndIndicator;
});
- /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API.
[EditorBrowsable(EditorBrowsableState.Never)]
public static readonly BindableProperty TrackThicknessProperty = BindableProperty.Create(nameof(TrackThickness), typeof(uint?), typeof(SliderStyle), null, propertyChanged: (bindable, oldValue, newValue) =>
{
var instance = (SliderStyle)bindable;
return instance.privateTrackThickness;
});
- /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API.
[EditorBrowsable(EditorBrowsableState.Never)]
public static readonly BindableProperty TrackPaddingProperty = BindableProperty.Create(nameof(TrackPadding), typeof(Extents), typeof(SliderStyle), null, propertyChanged: (bindable, oldValue, newValue) =>
{
public TextLabelStyle HighIndicator { get; set; } = new TextLabelStyle();
/// <summary>
+ /// Get or set the value indicator text.
+ /// </summary>
+ /// This will be public opened later after ACR done. Before ACR, need to be hidden as inhouse API.
+ [EditorBrowsable(EditorBrowsableState.Never)]
+ public TextLabelStyle ValueIndicatorText { get; set; } = new TextLabelStyle();
+
+ /// <summary>
+ /// Get or set the value indicator image.
+ /// </summary>
+ /// This will be public opened later after ACR done. Before ACR, need to be hidden as inhouse API.
+ [EditorBrowsable(EditorBrowsableState.Never)]
+ public ImageViewStyle ValueIndicatorImage { get; set; } = new ImageViewStyle();
+
+ /// <summary>
/// Get or set Indicator type
/// </summary>
/// <since_tizen> 8 </since_tizen>
HighIndicatorImage.CopyFrom(sliderStyle.HighIndicatorImage);
LowIndicator.CopyFrom(sliderStyle.LowIndicator);
HighIndicator.CopyFrom(sliderStyle.HighIndicator);
+ ValueIndicatorText.CopyFrom(sliderStyle.ValueIndicatorText);
+ ValueIndicatorImage.CopyFrom(sliderStyle.ValueIndicatorImage);
}
}
["SliderThumbImageResourceUrl"] = FrameworkInformation.ResourcePath + "nui_component_default_slider_thumb_n.png",
["SliderThumbBackgroundImageNormal"] = FrameworkInformation.ResourcePath + "nui_component_default_slider_thumb_bg_p.png",
["SliderThumbBackgroundImagePressed"] = FrameworkInformation.ResourcePath + "nui_component_default_slider_thumb_bg_p.png",
+ ["SliderValueIndicatorImage"] = FrameworkInformation.ResourcePath + "nui_component_default_slider_value_indicator.png",
["SwitchTrackImageResourceUrlNormal"] = FrameworkInformation.ResourcePath + "nui_component_default_switch_track_n.png",
["SwitchTrackImageResourceUrlSelected"] = FrameworkInformation.ResourcePath + "nui_component_default_switch_track_s.png",
["SwitchTrackImageResourceUrlDisabled"] = FrameworkInformation.ResourcePath + "nui_component_default_switch_track_d.png",
Pressed = (string)theme.Resources["SliderThumbBackgroundImagePressed"],
}
},
+ ValueIndicatorImage = new ImageViewStyle()
+ {
+ Size = new Size(83, 54),
+ ResourceUrl = (string)theme.Resources["SliderValueIndicatorImage"],
+ },
});
theme.AddStyleWithoutClone("Tizen.NUI.Components.Switch", new SwitchStyle()
projects / platform / core / csapi / tizenfx.git / commitdiff
