GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Merge branch 'slider-thumb-highlighting' of https://github.com/Tryibion/FlaxEngine into Tryibion-slider-thumb-highlighting

Browse Source
This commit is contained in:
Wojtek Figat
2023-09-18 17:29:41 +02:00
parent fa73d9d451 dabbd7bc6a
commit 3c28fbe44c
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Source/Engine/UI/GUI/Common/Slider.cs
View File

@@ -60,6 +60,7 @@ public class Slider : ContainerControl
private float _thumbCenter; private float _thumbCenter;
private Float2 _thumbSize = new Float2(16, 16); private Float2 _thumbSize = new Float2(16, 16);
private bool _isSliding; private bool _isSliding;
private bool _mouseOverThumb;
/// <summary> /// <summary>
/// Gets or sets the value (normalized to range 0-100). /// Gets or sets the value (normalized to range 0-100).
@@ -163,21 +164,27 @@ public class Slider : ContainerControl
public IBrush FillTrackBrush { get; set; } public IBrush FillTrackBrush { get; set; }
/// <summary> /// <summary>
/// The color of the slider thumb when it's not selected /// The color of the slider thumb when it's not selected.
/// </summary> /// </summary>
[EditorDisplay("Thumb Style"), EditorOrder(2030), Tooltip("The color of the slider thumb when it's not selected."), ExpandGroups] [EditorDisplay("Thumb Style"), EditorOrder(2030), Tooltip("The color of the slider thumb when it's not selected."), ExpandGroups]
public Color ThumbColor { get; set; } public Color ThumbColor { get; set; }
/// <summary>
/// The color of the slider thumb when it's highlighted.
/// </summary>
[EditorDisplay("Thumb Style"), EditorOrder(2031), Tooltip("The color of the slider thumb when it's highlighted.")]
public Color ThumbColorHighlighted { get; set; }
/// <summary> /// <summary>
/// The color of the slider thumb when it's selected /// The color of the slider thumb when it's selected.
/// </summary> /// </summary>
[EditorDisplay("Thumb Style"), EditorOrder(2031), Tooltip("The color of the slider thumb when it's selected.")] [EditorDisplay("Thumb Style"), EditorOrder(2032), Tooltip("The color of the slider thumb when it's selected.")]
public Color ThumbColorSelected { get; set; } public Color ThumbColorSelected { get; set; }
/// <summary> /// <summary>
/// Gets or sets the brush used for slider thumb drawing. /// Gets or sets the brush used for slider thumb drawing.
/// </summary> /// </summary>
[EditorDisplay("Thumb Style"), EditorOrder(2032), Tooltip("The brush of the slider thumb.")] [EditorDisplay("Thumb Style"), EditorOrder(2033), Tooltip("The brush of the slider thumb.")]
public IBrush ThumbBrush { get; set; } public IBrush ThumbBrush { get; set; }
/// <summary> /// <summary>
@@ -222,6 +229,7 @@ public class Slider : ContainerControl
TrackFillLineColor = style.LightBackground; TrackFillLineColor = style.LightBackground;
ThumbColor = style.BackgroundNormal; ThumbColor = style.BackgroundNormal;
ThumbColorSelected = style.BackgroundSelected; ThumbColorSelected = style.BackgroundSelected;
ThumbColorHighlighted = style.BackgroundHighlighted;
UpdateThumb(); UpdateThumb();
} }
@@ -270,7 +278,7 @@ public class Slider : ContainerControl
} }
// Draw thumb // Draw thumb
var thumbColor = _isSliding ? ThumbColorSelected : ThumbColor; var thumbColor = _isSliding ? ThumbColorSelected : (_mouseOverThumb ? ThumbColorHighlighted : ThumbColor);
if (ThumbBrush != null) if (ThumbBrush != null)
ThumbBrush.Draw(_thumbRect, thumbColor); ThumbBrush.Draw(_thumbRect, thumbColor);
else else
@@ -317,6 +325,7 @@ public class Slider : ContainerControl
/// <inheritdoc /> /// <inheritdoc />
public override void OnMouseMove(Float2 location) public override void OnMouseMove(Float2 location)
{ {
_mouseOverThumb = _thumbRect.Contains(location);
if (_isSliding) if (_isSliding)
{ {
// Update sliding // Update sliding