|
@@ -7,6 +7,7 @@ using UnityEngine.EventSystems;
|
|
|
using UnityEngine.Serialization;
|
|
|
using UnityEngine.UI;
|
|
|
using UnityEngine;
|
|
|
+using static UnityEngine.UI.InputField;
|
|
|
#if UNITY_EDITOR
|
|
|
using UnityEditor;
|
|
|
#endif
|
|
@@ -145,8 +146,9 @@ namespace SC.XR.Unity
|
|
|
[FormerlySerializedAs("onSubmit")]
|
|
|
[FormerlySerializedAs("m_OnSubmit")]
|
|
|
[FormerlySerializedAs("m_EndEdit")]
|
|
|
+ [FormerlySerializedAs("m_OnEndEdit")]
|
|
|
[SerializeField]
|
|
|
- protected SubmitEvent m_OnEndEdit = new SubmitEvent();
|
|
|
+ private SubmitEvent m_OnSubmit = new SubmitEvent();
|
|
|
|
|
|
|
|
|
|
|
@@ -156,6 +158,8 @@ namespace SC.XR.Unity
|
|
|
[SerializeField]
|
|
|
protected OnChangeEvent m_OnValueChanged = new OnChangeEvent();
|
|
|
|
|
|
+ [SerializeField]
|
|
|
+ private EndEditEvent m_OnDidEndEdit = new EndEditEvent();
|
|
|
|
|
|
|
|
|
|
|
@@ -421,8 +425,8 @@ namespace SC.XR.Unity
|
|
|
|
|
|
public Color selectionColor { get { return m_SelectionColor; } set { if (SCSetPropertyUtility.SetColor(ref m_SelectionColor, value)) MarkGeometryAsDirty(); } }
|
|
|
|
|
|
- public SubmitEvent onEndEdit { get { return m_OnEndEdit; } set { SCSetPropertyUtility.SetClass(ref m_OnEndEdit, value); } }
|
|
|
-
|
|
|
+ public EndEditEvent onEndEdit { get { return m_OnDidEndEdit; } set { SCSetPropertyUtility.SetClass(ref m_OnDidEndEdit, value); } }
|
|
|
+ public SubmitEvent onSubmit { get { return m_OnSubmit; } set { SCSetPropertyUtility.SetClass(ref m_OnSubmit, value); } }
|
|
|
[Obsolete("onValueChange has been renamed to onValueChanged")]
|
|
|
public OnChangeEvent onValueChange { get { return onValueChanged; } set { onValueChanged = value; } }
|
|
|
|