Skip to content

Commit 9493240

Browse files
committed
Revert "let's see if we can get away with cutting the whole OnGUI method altogether"
This reverts commit 5c56992.
1 parent d96b6e1 commit 9493240

File tree

12 files changed

+49
-0
lines changed

12 files changed

+49
-0
lines changed

Assets/Samples/CustomComposite/CustomComposite.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,10 @@ public override Vector2 ReadValue(ref InputBindingCompositeContext context)
134134
#if UNITY_EDITOR
135135
public class CustomCompositeEditor : InputParameterEditor<CustomComposite>
136136
{
137+
public override void OnGUI()
138+
{
139+
}
140+
137141
public override void OnDrawVisualElements(VisualElement root, Action onChangedCallback)
138142
{
139143
var slider = new Slider(m_ScaleFactorLabel.text, 0, 2)

Packages/com.unity.inputsystem/InputSystem/Actions/Composites/AxisComposite.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,10 @@ internal class AxisCompositeEditor : InputParameterEditor<AxisComposite>
216216
+ "If 'Neither' is selected, the result is 0 (or, more precisely, "
217217
+ "the midpoint between minValue and maxValue).";
218218

219+
public override void OnGUI()
220+
{
221+
}
222+
219223
public override void OnDrawVisualElements(VisualElement root, Action onChangedCallback)
220224
{
221225
var modeField = new EnumField(label, target.whichSideWins)

Packages/com.unity.inputsystem/InputSystem/Actions/Composites/Vector2Composite.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,10 @@ internal class Vector2CompositeEditor : InputParameterEditor<Vector2Composite>
196196
+ "treats part bindings as buttons (on/off) whereas Analog preserves "
197197
+ "floating-point magnitudes as read from controls.";
198198

199+
public override void OnGUI()
200+
{
201+
}
202+
199203
public override void OnDrawVisualElements(VisualElement root, Action onChangedCallback)
200204
{
201205
var modeField = new EnumField(label, target.mode)

Packages/com.unity.inputsystem/InputSystem/Actions/Composites/Vector3Composite.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,10 @@ internal class Vector3CompositeEditor : InputParameterEditor<Vector3Composite>
176176
+ "treats part bindings as buttons (on/off) whereas Analog preserves "
177177
+ "floating-point magnitudes as read from controls.";
178178

179+
public override void OnGUI()
180+
{
181+
}
182+
179183
public override void OnDrawVisualElements(VisualElement root, Action onChangedCallback)
180184
{
181185
var modeField = new EnumField(label, target.mode)

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,10 @@ protected override void OnEnable()
122122
() => target.duration, x => target.duration = x, () => InputSystem.settings.defaultHoldTime);
123123
}
124124

125+
public override void OnGUI()
126+
{
127+
}
128+
125129
public override void OnDrawVisualElements(VisualElement root, Action onChangedCallback)
126130
{
127131
m_PressPointSetting.OnDrawVisualElements(root, onChangedCallback);

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,10 @@ protected override void OnEnable()
192192
() => InputSystem.settings.defaultButtonPressPoint);
193193
}
194194

195+
public override void OnGUI()
196+
{
197+
}
198+
195199
public override void OnDrawVisualElements(VisualElement root, Action onChangedCallback)
196200
{
197201
var tapCountField = new IntegerField(tapLabel)

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,10 @@ protected override void OnEnable()
208208
() => InputSystem.settings.defaultButtonPressPoint);
209209
}
210210

211+
public override void OnGUI()
212+
{
213+
}
214+
211215
public override void OnDrawVisualElements(VisualElement root, Action onChangedCallback)
212216
{
213217
root.Add(new HelpBox(helpLabel, HelpBoxMessageType.None));

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,10 @@ protected override void OnEnable()
8585
() => InputSystem.settings.defaultButtonPressPoint);
8686
}
8787

88+
public override void OnGUI()
89+
{
90+
}
91+
8892
public override void OnDrawVisualElements(VisualElement root, Action onChangedCallback)
8993
{
9094
m_DurationSetting.OnDrawVisualElements(root, onChangedCallback);

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,10 @@ protected override void OnEnable()
111111
() => InputSystem.settings.defaultButtonPressPoint);
112112
}
113113

114+
public override void OnGUI()
115+
{
116+
}
117+
114118
public override void OnDrawVisualElements(VisualElement root, Action onChangedCallback)
115119
{
116120
m_DurationSetting.OnDrawVisualElements(root, onChangedCallback);

Packages/com.unity.inputsystem/InputSystem/Controls/Processors/AxisDeadzoneProcessor.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,10 @@ protected override void OnEnable()
9090
() => InputSystem.settings.defaultDeadzoneMax);
9191
}
9292

93+
public override void OnGUI()
94+
{
95+
}
96+
9397
public override void OnDrawVisualElements(VisualElement root, Action onChangedCallback)
9498
{
9599
m_MinSetting.OnDrawVisualElements(root, onChangedCallback);

0 commit comments

Comments
 (0)