Skip to content

Commit 875f33b

Browse files
CHANGE: Alignment with Press Point under HOLD interaction (#2373)
1 parent dc22083 commit 875f33b

2 files changed

Lines changed: 17 additions & 8 deletions

File tree

Packages/com.unity.inputsystem/InputSystem/Actions/DeferBindingResolutionContext.cs.meta

Lines changed: 10 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Packages/com.unity.inputsystem/InputSystem/Actions/Interactions/HoldInteraction.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -112,33 +112,33 @@ internal class HoldInteractionEditor : InputParameterEditor<HoldInteraction>
112112
{
113113
protected override void OnEnable()
114114
{
115-
m_PressPointSetting.Initialize("Press Point",
116-
"Float value that an axis control has to cross for it to be considered pressed.",
117-
"Default Button Press Point",
118-
() => target.pressPoint, v => target.pressPoint = v, () => ButtonControl.s_GlobalDefaultButtonPressPoint);
119115
m_DurationSetting.Initialize("Hold Time",
120116
"Time (in seconds) that a control has to be held in order for it to register as a hold.",
121117
"Default Hold Time",
122118
() => target.duration, x => target.duration = x, () => InputSystem.settings.defaultHoldTime);
119+
m_PressPointSetting.Initialize("Press Point",
120+
"Float value that an axis control has to cross for it to be considered pressed.",
121+
"Default Button Press Point",
122+
() => target.pressPoint, v => target.pressPoint = v, () => ButtonControl.s_GlobalDefaultButtonPressPoint);
123123
}
124124

125125
public override void OnGUI()
126126
{
127127
if (!InputSystem.settings.useIMGUIEditorForAssets)
128128
return;
129129

130-
m_PressPointSetting.OnGUI();
131130
m_DurationSetting.OnGUI();
131+
m_PressPointSetting.OnGUI();
132132
}
133133

134134
public override void OnDrawVisualElements(VisualElement root, Action onChangedCallback)
135135
{
136-
m_PressPointSetting.OnDrawVisualElements(root, onChangedCallback);
137136
m_DurationSetting.OnDrawVisualElements(root, onChangedCallback);
137+
m_PressPointSetting.OnDrawVisualElements(root, onChangedCallback);
138138
}
139139

140-
private CustomOrDefaultSetting m_PressPointSetting;
141140
private CustomOrDefaultSetting m_DurationSetting;
141+
private CustomOrDefaultSetting m_PressPointSetting;
142142
}
143143
#endif
144144
}

0 commit comments

Comments
 (0)