Skip to content

Commit cf5be55

Browse files
author
Julia Schwarz
committed
Add slider field to sliderEventData.
- slider points to the PinchSlider that fired the event - Used to match the pattern used by Android, for example the events in SeekBar: https://developer.android.com/reference/android/widget/SeekBar.OnSeekBarChangeListener.html
1 parent a9f7f45 commit cf5be55

File tree

2 files changed

+20
-7
lines changed

2 files changed

+20
-7
lines changed

Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Sliders/PinchSlider.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public float SliderValue
3232
var oldSliderValue = sliderValue;
3333
sliderValue = value;
3434
UpdateUI();
35-
OnValueUpdated.Invoke(new SliderEventData(oldSliderValue, value, activePointer is IMixedRealityPointer));
35+
OnValueUpdated.Invoke(new SliderEventData(oldSliderValue, value, activePointer is IMixedRealityPointer, this));
3636
}
3737
}
3838

@@ -134,7 +134,7 @@ public void Start()
134134
sliderThumbOffset = thumbRoot.transform.position - thumbProjectedOnTrack;
135135

136136
UpdateUI();
137-
OnValueUpdated.Invoke(new SliderEventData(sliderValue, sliderValue, false));
137+
OnValueUpdated.Invoke(new SliderEventData(sliderValue, sliderValue, false, this));
138138
}
139139

140140
private void OnDisable()
@@ -172,7 +172,7 @@ private void EndInteraction()
172172
{
173173
if (OnInteractionEnded != null)
174174
{
175-
OnInteractionEnded.Invoke(new SliderEventData(sliderValue, sliderValue, activePointer is IMixedRealityPointer));
175+
OnInteractionEnded.Invoke(new SliderEventData(sliderValue, sliderValue, activePointer is IMixedRealityPointer, this));
176176
}
177177
activePointer = null;
178178
}
@@ -182,12 +182,12 @@ private void EndInteraction()
182182
#region IMixedRealityFocusHandler
183183
public void OnFocusEnter(FocusEventData eventData)
184184
{
185-
OnHoverEntered.Invoke(new SliderEventData(sliderValue, sliderValue, eventData.Pointer is IMixedRealityNearPointer));
185+
OnHoverEntered.Invoke(new SliderEventData(sliderValue, sliderValue, eventData.Pointer is IMixedRealityNearPointer, this));
186186
}
187187

188188
public void OnFocusExit(FocusEventData eventData)
189189
{
190-
OnHoverExited.Invoke(new SliderEventData(sliderValue, sliderValue, eventData.Pointer is IMixedRealityNearPointer));
190+
OnHoverExited.Invoke(new SliderEventData(sliderValue, sliderValue, eventData.Pointer is IMixedRealityNearPointer, this));
191191
}
192192
#endregion
193193

@@ -214,7 +214,7 @@ public void OnPointerDown(MixedRealityPointerEventData eventData)
214214
startSliderPosition = gameObject.transform.position;
215215
if (OnInteractionStarted != null)
216216
{
217-
OnInteractionStarted.Invoke(new SliderEventData(sliderValue, sliderValue, activePointer is IMixedRealityPointer));
217+
OnInteractionStarted.Invoke(new SliderEventData(sliderValue, sliderValue, activePointer is IMixedRealityPointer, this));
218218
}
219219

220220
// Mark the pointer data as used to prevent other behaviors from handling input events

Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Sliders/SliderEventData.cs

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,29 @@ namespace Microsoft.MixedReality.Toolkit.UI
66
{
77
public class SliderEventData
88
{
9-
public SliderEventData(float o, float n, bool isNear)
9+
public SliderEventData(float o, float n, bool isNear, PinchSlider slider)
1010
{
1111
OldValue = o;
1212
NewValue = n;
1313
IsNear = isNear;
14+
Slider = slider;
1415
}
1516

17+
/// <summary>
18+
/// The previous value of the slider
19+
/// </summary>
1620
public float OldValue { get; private set; }
21+
22+
/// <summary>
23+
/// The current value of the slider
24+
/// </summary>
1725
public float NewValue { get; private set; }
1826

27+
/// <summary>
28+
/// The slider that triggered this event
29+
/// </summary>
30+
public PinchSlider Slider { get; private set; }
31+
1932
/// <summary>
2033
/// Whether the slider is being interacted near or at a distance.
2134
/// </summary>

0 commit comments

Comments
 (0)