Skip to content

FIX: Fixed action properties editor UI (ISXB-1277) #2083

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
merged 6 commits into from
Dec 12, 2024
Merged

FIX: Fixed action properties editor UI (ISXB-1277) #2083

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7380847
Fixed action properties editor ui
bmalrat Dec 9, 2024
637ac05
fix format
bmalrat Dec 9, 2024
cc66203
adjusted size
bmalrat Dec 10, 2024
799eae9
Merge branch 'develop' into isxb-1278-fix-action-properties-editor-ui
bmalrat Dec 11, 2024
ac87fc6
Merge branch 'develop' into isxb-1278-fix-action-properties-editor-ui
bmalrat Dec 12, 2024
a692c15
Merge branch 'develop' into isxb-1278-fix-action-properties-editor-ui
bmalrat Dec 12, 2024
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
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 @@ -33,6 +33,7 @@ however, it has to be formatted properly to pass verification tests.
- 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)
- Fixed an issue with default device selection when adding new Control Scheme.
- 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).
- 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)

### Changed
- Added back the InputManager to InputSystem project-wide asset migration code with performance improvement (ISX-2086).
Expand Down
10 changes: 9 additions & 1 deletion Packages/com.unity.inputsystem/InputSystem/Editor/InputParameterEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,8 +249,16 @@ public void OnDrawVisualElements(VisualElement root, Action onChangedCallback)

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

m_DefaultToggle = new Toggle("Default") { value = m_UseDefaultValue };
m_DefaultToggle = new Toggle("Default")
{
value = m_UseDefaultValue,
style =
{
flexDirection = FlexDirection.RowReverse
}
};
m_DefaultToggle.RegisterValueChangedCallback(evt => ToggleUseDefaultValue(evt, onChangedCallback));
m_DefaultToggle.Q<Label>().style.minWidth = new StyleLength(StyleKeyword.Auto);


var buttonContainer = new VisualElement
Expand Down
2 changes: 1 addition & 1 deletion ...ages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorWindow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ static InputActionsEditorWindow()
InputActionAssetEditor.RegisterType<InputActionsEditorWindow>();
}

static readonly Vector2 k_MinWindowSize = new Vector2(650, 450);
static readonly Vector2 k_MinWindowSize = new Vector2(740, 450);
// For UI testing purpose
internal InputActionAsset currentAssetInEditor => m_AssetObjectForEditing;
[SerializeField] private InputActionAsset m_AssetObjectForEditing;
Expand Down
4 changes: 2 additions & 2 deletions ...y.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/InputActionsEditor.uxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</ui:VisualElement>
<ui:VisualElement name="rclick-area-to-add-new-action-map" style="flex-direction: column; flex-grow: 1;" />
</ui:VisualElement>
<ui:TwoPaneSplitView name="actions-and-properties-split-view" fixed-pane-index="1" fixed-pane-initial-dimension="230" style="height: auto; min-width: 450px">
<ui:TwoPaneSplitView name="actions-and-properties-split-view" fixed-pane-index="1" fixed-pane-initial-dimension="320" style="height: auto; min-width: 450px;">
<ui:VisualElement name="actions-container" class="body-panel-container">
<ui:VisualElement name="header" class="body-panel-header" style="justify-content: space-between;">
<ui:Label text="Actions" display-tooltip-when-elided="true" name="actions-label" />
Expand All @@ -39,7 +39,7 @@
</ui:VisualElement>
<ui:VisualElement name="rclick-area-to-add-new-action" style="flex-direction: column; flex-grow: 1;" />
</ui:VisualElement>
<ui:VisualElement name="properties-container" class="body-panel-container body-panel-container" style="min-width: 220;">
<ui:VisualElement name="properties-container" class="body-panel-container body-panel-container" style="min-width: 310px;">
<ui:VisualElement name="header" class="body-panel-header">
<ui:Label text="Action Properties" display-tooltip-when-elided="true" name="properties-header-label" />
</ui:VisualElement>
Expand Down
Loading