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