Skip to content

Commit d5f8543

Browse files
authored
FIX: Fixed action properties editor UI (ISXB-1277) (#2083)
1 parent 102b004 commit d5f8543

File tree

4 files changed

+13
-4
lines changed

4 files changed

+13
-4
lines changed

Packages/com.unity.inputsystem/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ however, it has to be formatted properly to pass verification tests.
3333
- Fixed an issue when displaying Serialized InputAction's Processor properties inside the Inspector window. [ISXB-1269](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1269)
3434
- Fixed an issue with default device selection when adding new Control Scheme.
3535
- Fixed an issue where action map delegates were not updated when the asset already assigned to the PlayerInput component were changed [ISXB-711](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-711).
36+
- Fixed Action properties edition in the UI Toolkit version of the Input Actions Asset editor. [ISXB-1277](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1277)
3637

3738
### Changed
3839
- Added back the InputManager to InputSystem project-wide asset migration code with performance improvement (ISX-2086).

Packages/com.unity.inputsystem/InputSystem/Editor/InputParameterEditor.cs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,8 +249,16 @@ public void OnDrawVisualElements(VisualElement root, Action onChangedCallback)
249249

250250
m_HelpBox = new HelpBox(m_HelpBoxText.text, HelpBoxMessageType.None);
251251

252-
m_DefaultToggle = new Toggle("Default") { value = m_UseDefaultValue };
252+
m_DefaultToggle = new Toggle("Default")
253+
{
254+
value = m_UseDefaultValue,
255+
style =
256+
{
257+
flexDirection = FlexDirection.RowReverse
258+
}
259+
};
253260
m_DefaultToggle.RegisterValueChangedCallback(evt => ToggleUseDefaultValue(evt, onChangedCallback));
261+
m_DefaultToggle.Q<Label>().style.minWidth = new StyleLength(StyleKeyword.Auto);
254262

255263

256264
var buttonContainer = new VisualElement

Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorWindow.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ static InputActionsEditorWindow()
2929
InputActionAssetEditor.RegisterType<InputActionsEditorWindow>();
3030
}
3131

32-
static readonly Vector2 k_MinWindowSize = new Vector2(650, 450);
32+
static readonly Vector2 k_MinWindowSize = new Vector2(740, 450);
3333
// For UI testing purpose
3434
internal InputActionAsset currentAssetInEditor => m_AssetObjectForEditing;
3535
[SerializeField] private InputActionAsset m_AssetObjectForEditing;

Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/InputActionsEditor.uxml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</ui:VisualElement>
2929
<ui:VisualElement name="rclick-area-to-add-new-action-map" style="flex-direction: column; flex-grow: 1;" />
3030
</ui:VisualElement>
31-
<ui:TwoPaneSplitView name="actions-and-properties-split-view" fixed-pane-index="1" fixed-pane-initial-dimension="230" style="height: auto; min-width: 450px">
31+
<ui:TwoPaneSplitView name="actions-and-properties-split-view" fixed-pane-index="1" fixed-pane-initial-dimension="320" style="height: auto; min-width: 450px;">
3232
<ui:VisualElement name="actions-container" class="body-panel-container">
3333
<ui:VisualElement name="header" class="body-panel-header" style="justify-content: space-between;">
3434
<ui:Label text="Actions" display-tooltip-when-elided="true" name="actions-label" />
@@ -39,7 +39,7 @@
3939
</ui:VisualElement>
4040
<ui:VisualElement name="rclick-area-to-add-new-action" style="flex-direction: column; flex-grow: 1;" />
4141
</ui:VisualElement>
42-
<ui:VisualElement name="properties-container" class="body-panel-container body-panel-container" style="min-width: 220;">
42+
<ui:VisualElement name="properties-container" class="body-panel-container body-panel-container" style="min-width: 310px;">
4343
<ui:VisualElement name="header" class="body-panel-header">
4444
<ui:Label text="Action Properties" display-tooltip-when-elided="true" name="properties-header-label" />
4545
</ui:VisualElement>

0 commit comments

Comments
 (0)