Skip to content

Commit 017782c

Browse files
authored
Merge branch 'develop' into isxb-1221-input-action-binding-discarded
2 parents 980d936 + d3eae07 commit 017782c

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Packages/com.unity.inputsystem/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ however, it has to be formatted properly to pass verification tests.
1818
- Fixed an issue where compiling Addressables with Input System package present would result in failed compilation due to `IInputAnalytic.TryGatherData` not being defined [ISXB-1203](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1203).
1919
- Pinned Touch Samples sample package dependencies to avoid errors with Cinemachine 3.x and Probuilder 6.x. [ISXB-1245](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1245)
2020
- Fixed issue where a binding path is sometimes not saved when chosen from the binding path picker. [ISXB-1221](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1221)
21+
- Fixed an issue where dropdown menu for Path in Input Actions Editor could not be selected from any button position. [ISXB-1309](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1309)
2122

2223
## [1.12.0] - 2025-01-15
2324

Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,18 +85,17 @@ public void OnGUI(Rect rect, GUIContent label = null, Action modifiedCallback =
8585

8686
var lineRect = rect;
8787
var labelRect = lineRect;
88-
labelRect.width = EditorGUIUtility.labelWidth;
88+
labelRect.width = EditorStyles.label.CalcSize(pathLabel).x + 20; // Fit to label with some padding
8989
EditorGUI.LabelField(labelRect, pathLabel);
9090
lineRect.x += labelRect.width;
9191
lineRect.width -= labelRect.width;
9292

9393
var bindingTextRect = lineRect;
9494
var editButtonRect = lineRect;
9595

96-
var bindingTextRectOffset = 80;
97-
bindingTextRect.width += bindingTextRectOffset;
98-
bindingTextRect.x -= bindingTextRectOffset + 20;
99-
editButtonRect.x = bindingTextRect.x + bindingTextRect.width; // Place it directly after the textRect
96+
bindingTextRect.x = labelRect.x + labelRect.width; // Place directly after labelRect
97+
editButtonRect.x += lineRect.width - 20; // Place at the edge of the window to appear after bindingTextRect
98+
bindingTextRect.width = editButtonRect.x - bindingTextRect.x; // bindingTextRect fills remaining space between label and editButton
10099
editButtonRect.width = 20;
101100
editButtonRect.height = 15;
102101

0 commit comments

Comments
 (0)