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

Merge branch 'Tryibion-slider-focus'

Browse Source
This commit is contained in:
Wojtek Figat
2024-05-30 12:07:25 +02:00
parent 0f485cf77c 9533289e57
commit d0ec3fa2e2
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Source/Editor/GUI/Input/SliderControl.cs
View File

@@ -132,6 +132,8 @@ namespace FlaxEditor.GUI.Input
_isSliding = false;
EndMouseCapture();
SlidingEnd?.Invoke();
Defocus();
Parent?.Focus();
}
/// <summary>
@@ -183,6 +185,8 @@ namespace FlaxEditor.GUI.Input
{
// Click change
Value += (mousePosition < _thumbCenter ? -1 : 1) * 10;
Defocus();
Parent?.Focus();
}
}
@@ -197,6 +201,10 @@ namespace FlaxEditor.GUI.Input
// Update sliding
var slidePosition = location + Root.TrackingMouseOffset;
Value = Mathf.Remap(slidePosition.X, 4, TrackSize - 4, Minimum, Maximum);
if (Mathf.NearEqual(Value, Maximum))
Value = Maximum;
else if (Mathf.NearEqual(Value, Minimum))
Value = Minimum;
}
else
{
@@ -364,7 +372,7 @@ namespace FlaxEditor.GUI.Input
};
_slider.ValueChanged += SliderOnValueChanged;
_slider.SlidingStart += SlidingStart;
_slider.SlidingEnd += SlidingEnd;
_slider.SlidingEnd += SliderOnSliderEnd;
_textBox = new TextBox(false, split, 0)
{
Text = _value.ToString(CultureInfo.InvariantCulture),
@@ -375,6 +383,13 @@ namespace FlaxEditor.GUI.Input
_textBox.EditEnd += OnTextBoxEditEnd;
}
private void SliderOnSliderEnd()
{
SlidingEnd?.Invoke();
Defocus();
Parent?.Focus();
}
private void SliderOnValueChanged()
{
if (_valueIsChanging)
@@ -397,6 +412,8 @@ namespace FlaxEditor.GUI.Input
{
UpdateText();
}
Defocus();
Parent?.Focus();
}
/// <summary>