Skip to content

CHANGE: Enable IMGUI Asset Editor for input action assets when UITK is available (ISX-1541) #1731

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
jfreire-unity merged 3 commits into from
Aug 22, 2023
Merged

CHANGE: Enable IMGUI Asset Editor for input action assets when UITK is available (ISX-1541) #1731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8afb163
Enable IMGUI Asset Editor for custom input action assets
jfreire-unity Aug 15, 2023
51d6766
Merge branch 'develop' into isx-1541-enable-imgui-editor-for-assets
jfreire-unity Aug 16, 2023
e7825f3
Merge branch 'develop' into isx-1541-enable-imgui-editor-for-assets
jfreire-unity Aug 21, 2023
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
3 changes: 1 addition & 2 deletions Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputActionEditorWindow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,9 @@ internal class InputActionEditorWindow : EditorWindow, IDisposable
public static bool OnOpenAsset(int instanceId, int line)
{
#if UNITY_INPUT_SYSTEM_UI_TK_ASSET_EDITOR
if (InputSystem.settings.IsFeatureEnabled(InputFeatureNames.kUseUIToolkitEditor))
if (InputSystem.settings.IsFeatureEnabled(InputFeatureNames.kUseUIToolkitEditor) && InputActionsEditorWindow.isWindowEnabled)
return false;
#endif

var path = AssetDatabase.GetAssetPath(instanceId);
if (!path.EndsWith(k_FileExtension, StringComparison.InvariantCultureIgnoreCase))
return false;
Expand Down
9 changes: 8 additions & 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 @@ -24,6 +24,13 @@ static EnableUITKEditor()
internal class InputActionsEditorWindow : EditorWindow
{
private static readonly string k_FileExtension = "." + InputActionAsset.Extension;
/// <summary>
/// Controls whether the UITK version of the InputActionAsset Editor is enabled or not for editing Input Action
/// assets.
/// </summary>
/// At the moment, the UITK Asset Editor doesn't have feature parity with the IMGUI version.
/// This is set to false to show the IMGUI version of the InputActionAsset Editor instead.
internal static bool isWindowEnabled = false;
private int m_AssetId;
private string m_AssetPath;
private string m_AssetJson;
Expand All @@ -32,7 +39,7 @@ internal class InputActionsEditorWindow : EditorWindow
[OnOpenAsset]
public static bool OpenAsset(int instanceId, int line)
{
if (!InputSystem.settings.IsFeatureEnabled(InputFeatureNames.kUseUIToolkitEditor))
if (!InputSystem.settings.IsFeatureEnabled(InputFeatureNames.kUseUIToolkitEditor) || !isWindowEnabled)
return false;

var path = AssetDatabase.GetAssetPath(instanceId);
Expand Down