Skip to content

FIX: Extra empty lines added in the control bindings drop-down for some mouse buttons #2299

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
K-Tone merged 4 commits into from
Dec 11, 2025
+3 −2
Merged

FIX: Extra empty lines added in the control bindings drop-down for some mouse buttons #2299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2fd49dd
don't add items that have no searchable name anyways
K-Tone Dec 8, 2025
2acc063
update changelog
K-Tone Dec 9, 2025
f673649
what if we only run this test if ugui is present
K-Tone Dec 10, 2025
de288ab
Update CHANGELOG.md
Pauliusd01 Dec 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Assets/Tests/InputSystem.Editor/UGUITests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if UNITY_EDITOR && UNITY_6000_0_OR_NEWER
#if UNITY_EDITOR && UNITY_6000_0_OR_NEWER && UNITY_INPUT_SYSTEM_ENABLE_UI
using System;
using NUnit.Framework;
using UnityEditor;
Expand Down
1 change: 1 addition & 0 deletions Packages/com.unity.inputsystem/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ however, it has to be formatted properly to pass verification tests.
### Fixed

- Fixed warnings being generated on Unity 6.4 and 6.5. (ISX-2395).
- Fixed extra empty lines being displayed in the control binding list when mouse buttons are pressed [ISXB-1677](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1677)

## [1.17.0] - 2025-11-25

Expand Down
2 changes: 1 addition & 1 deletion ...ty.inputsystem/InputSystem/Editor/Internal/AdvancedDropdown/AdvancedDropdownDataSource.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
{
if (!item.children.Any())
{
if (!item.IsSeparator())
if (!item.IsSeparator() && item.searchableName.Length > 0)

Check warning on line 121 in Packages/com.unity.inputsystem/InputSystem/Editor/Internal/AdvancedDropdown/AdvancedDropdownDataSource.cs

View check run for this annotation

Codecov GitHub.com / codecov/patch

Packages/com.unity.inputsystem/InputSystem/Editor/Internal/AdvancedDropdown/AdvancedDropdownDataSource.cs#L121 

Added line #L121 was not covered by tests
Copy link
Collaborator Author

@K-Tone K-Tone Dec 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's it basically. We would like not to search in non-searchable items because they end up as empty lines in the displayed list in the end.

m_SearchableElements.Add(item);
return;
}
Expand Down