Skip to content

Mark bindings not included into the current control scheme (ISX-1133) #1721

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 2 commits into from
Aug 7, 2023
Merged

Mark bindings not included into the current control scheme (ISX-1133) #1721

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2f1083
implemented indicating bindings not included into the current control…
ritamerkl Aug 3, 2023
aa9fc27
Merge branch 'develop' into ISX-1133-indicate-bindings-by-selected-co…
ritamerkl Aug 7, 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
20 changes: 15 additions & 5 deletions Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ public static List<TreeViewItemData<ActionOrBindingData>> GetActionsAsTreeViewDa
var nextBinding = actionBindings[++i];
while (nextBinding.isPartOfComposite)
{
var name = GetHumanReadableCompositeName(nextBinding);
var name = GetHumanReadableCompositeName(nextBinding, state.selectedControlScheme, state.selectedControlSchemeIndex);

compositeItems.Add(new TreeViewItemData<ActionOrBindingData>(id++,
new ActionOrBindingData(false, name, actionMapIndex, false, GetControlLayout(nextBinding.path), nextBinding.indexOfBinding)));
Expand All @@ -341,7 +341,7 @@ public static List<TreeViewItemData<ActionOrBindingData>> GetActionsAsTreeViewDa
else
{
bindingItems.Add(new TreeViewItemData<ActionOrBindingData>(id++,
new ActionOrBindingData(false, GetHumanReadableBindingName(serializedInputBinding), actionMapIndex,
new ActionOrBindingData(false, GetHumanReadableBindingName(serializedInputBinding, state.selectedControlSchemeIndex, state.selectedControlScheme), actionMapIndex,
false, GetControlLayout(serializedInputBinding.path), serializedInputBinding.indexOfBinding)));
}
}
Expand All @@ -351,18 +351,28 @@ public static List<TreeViewItemData<ActionOrBindingData>> GetActionsAsTreeViewDa
return actionItems;
}

private static string GetHumanReadableBindingName(SerializedInputBinding serializedInputBinding)
private static string GetHumanReadableBindingName(SerializedInputBinding serializedInputBinding, int currentControlSchemeIndex, InputControlScheme? currentControlScheme)
{
var name = InputControlPath.ToHumanReadableString(serializedInputBinding.path);
if (String.IsNullOrEmpty(name))
name = "<No Binding>";
if (!IsBindingPartOfCurrentControlScheme(serializedInputBinding, currentControlScheme, currentControlSchemeIndex))
name += " {GLOBAL}";
return name;
}

internal static string GetHumanReadableCompositeName(SerializedInputBinding binding)
private static bool IsBindingPartOfCurrentControlScheme(SerializedInputBinding serializedInputBinding, InputControlScheme? currentControlScheme, int currentControlSchemeIndex)
{
if (currentControlScheme.HasValue && currentControlSchemeIndex >= 0)
return serializedInputBinding.controlSchemes.Contains(currentControlScheme.Value.name);

return true;
}

internal static string GetHumanReadableCompositeName(SerializedInputBinding binding, InputControlScheme? currentControlScheme, int currentControlSchemeIndex)
{
return $"{ObjectNames.NicifyVariableName(binding.name)}: " +
$"{GetHumanReadableBindingName(binding)}";
$"{GetHumanReadableBindingName(binding, currentControlSchemeIndex, currentControlScheme)}";
}

private static string GetControlLayout(string path)
Expand Down