From c18127728e50f7c0e82615b41b1f26ba8a7833b8 Mon Sep 17 00:00:00 2001 From: Paulius Dervinis Date: Thu, 20 Aug 2026 07:34:20 +0300 Subject: [PATCH 1/4] FIX: Inset the search field in the "Add supported device" popup so it no longer sits flush against the popup's left edge [UUM-150217] The search field in the "Add supported device" popup drew flush against the popup's left edge with no left margin, while its right edge kept the base field's spacing. InputControlPickerDropdown.InputControlPickerGUI.DrawSearchFieldControl(string searchString) wraps the field in a HorizontalScope whose only leading element (the "Listen" toggle block) is emitted exclusively in PickControl mode, so in PickDevice mode nothing offset the field from the left edge. Added an else branch that emits a GUILayout.Space(3f) when the "Listen" block is absent, giving the field a left inset that matches its right-side spacing and leaving PickControl mode untouched. Jira: https://issuetracker.unity3d.com/product/unity/issues/guid/UUM-150217 --- Packages/com.unity.inputsystem/CHANGELOG.md | 1 + .../Editor/ControlPicker/InputControlPickerDropdown.cs | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md index 10e1e71015..dfe4b43bbd 100644 --- a/Packages/com.unity.inputsystem/CHANGELOG.md +++ b/Packages/com.unity.inputsystem/CHANGELOG.md @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Fixed +- Fixed the search field in the "Add supported device" popup (Input System Package Settings > Supported Devices > "+") drawing flush against the popup's left edge with no left margin, unlike its right-side spacing; it is now inset to match [UUM-150217](https://issuetracker.unity3d.com/product/unity/issues/guid/UUM-150217) - Fixed the "Supported Devices" list in the Input System Package Settings sitting flush against the panel edge with no left/right margin, unlike the surrounding fields; it is now inset to line up with the other settings controls [UUM-150207](https://issuetracker.unity3d.com/product/unity/issues/guid/UUM-150207) - Fixed the Inspector help button for a selected `.inputactions` asset ("Open Reference for Input Action Importer") opening a missing documentation page; it now links to the Action Assets manual page [UUM-149518](https://issuetracker.unity3d.com/product/unity/issues/guid/UUM-149518) - Fixed an `OverflowException` when creating a control scheme (or other named item) whose all-numeric name exceeds `Int32.MaxValue`, which previously discarded the entered name and fell back to the default [UUM-145766](https://issuetracker.unity3d.com/product/unity/issues/guid/UUM-145766) diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPickerDropdown.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPickerDropdown.cs index ae2ff1e9a4..16c24a661a 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPickerDropdown.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPickerDropdown.cs @@ -598,6 +598,12 @@ internal override string DrawSearchFieldControl(string searchString) isListening = isListeningNew; } } + else + { + // In PickDevice mode there is no leading "Listen" block, so inset the search + // field from the popup's left edge to match its right-side spacing. + GUILayout.Space(3f); + } ////FIXME: the search box doesn't clear out when listening; no idea why the new string isn't taking effect EditorGUI.BeginDisabledGroup(isListening); From 060a26665b9b29e37b15aa4395dccad1a7380f15 Mon Sep 17 00:00:00 2001 From: Paulius Dervinis Date: Thu, 20 Aug 2026 07:54:06 +0300 Subject: [PATCH 2/4] FIX: Tune search-field inset to 8px and drop redundant comment [UUM-150217] Bump the PickDevice-mode search-field inset in DrawSearchFieldControl from 3px to 8px and remove the explanatory comment. Jira: https://issuetracker.unity3d.com/product/unity/issues/guid/UUM-150217 --- .../Editor/ControlPicker/InputControlPickerDropdown.cs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPickerDropdown.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPickerDropdown.cs index 16c24a661a..70adc689d9 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPickerDropdown.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPickerDropdown.cs @@ -600,9 +600,7 @@ internal override string DrawSearchFieldControl(string searchString) } else { - // In PickDevice mode there is no leading "Listen" block, so inset the search - // field from the popup's left edge to match its right-side spacing. - GUILayout.Space(3f); + GUILayout.Space(8f); } ////FIXME: the search box doesn't clear out when listening; no idea why the new string isn't taking effect From 7088a81d5e262f6469e485cd786fe4558560d9eb Mon Sep 17 00:00:00 2001 From: Paulius Dervinis Date: Thu, 20 Aug 2026 07:55:27 +0300 Subject: [PATCH 3/4] FIX: Also inset the Listen block in PickControl mode [UUM-150217] Add a 3px leading inset before the "Listen" toggle block in DrawSearchFieldControl so it is no longer flush against the popup's left edge in PickControl mode. Jira: https://issuetracker.unity3d.com/product/unity/issues/guid/UUM-150217 --- .../Editor/ControlPicker/InputControlPickerDropdown.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPickerDropdown.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPickerDropdown.cs index 70adc689d9..b48e097f50 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPickerDropdown.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPickerDropdown.cs @@ -575,6 +575,7 @@ internal override string DrawSearchFieldControl(string searchString) // When picking controls, have a "Listen" button that allows listening for input. if (m_Owner.m_Mode == InputControlPicker.Mode.PickControl) { + GUILayout.Space(3f); using (new EditorGUILayout.VerticalScope(GUILayout.MaxWidth(50))) { GUILayout.Space(4); From 383dcdeef94ae58d56c3d778b04646045e1fdc8e Mon Sep 17 00:00:00 2001 From: Paulius Dervinis Date: Thu, 20 Aug 2026 08:00:48 +0300 Subject: [PATCH 4/4] FIX: Match the Listen block inset to the search field at 8px [UUM-150217] Bump the PickControl-mode "Listen" block inset in DrawSearchFieldControl from 3px to 8px so both modes share the same left inset. Jira: https://issuetracker.unity3d.com/product/unity/issues/guid/UUM-150217 --- .../Editor/ControlPicker/InputControlPickerDropdown.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPickerDropdown.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPickerDropdown.cs index b48e097f50..629ac82016 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPickerDropdown.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPickerDropdown.cs @@ -575,7 +575,7 @@ internal override string DrawSearchFieldControl(string searchString) // When picking controls, have a "Listen" button that allows listening for input. if (m_Owner.m_Mode == InputControlPicker.Mode.PickControl) { - GUILayout.Space(3f); + GUILayout.Space(8f); using (new EditorGUILayout.VerticalScope(GUILayout.MaxWidth(50))) { GUILayout.Space(4);