Merge remote-tracking branch 'origin/develop' into isxb-806-fix-for-composites-with-modifiers-doc-and-tooltips

bmalrat · bmalrat · commit a01fd2cdcf65 · 2024-11-22T11:08:46.000-05:00
# Conflicts:
#	Packages/com.unity.inputsystem/CHANGELOG.md
diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md
@@ -22,6 +22,8 @@ however, it has to be formatted properly to pass verification tests.
 - Fixed missing documentation for source generated Input Action Assets. This is now generated as part of the source code generation step when "Generate C# Class" is checked in the importer inspector settings.
 - Fixed pasting into an empty map list raising an exception. [ISXB-1150](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1150)
 - Fixed pasting bindings into empty Input Action asset. [ISXB-1180](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1180)
+- Fixed missing '&' symbol in Control Scheme dropdown on Windows platform. [ISXB-1109](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1109)
+- Fixed icon scaling in Input Actions window.
 - Fixed tooltip support in the UI Toolkit version of the Input Actions Asset editor.
 - Fixed documentation to clarify bindings with modifiers `overrideModifiersNeedToBePressedFirst` configuration [ISXB-806](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-806).
 
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Internal/GUIHelpers.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/Internal/GUIHelpers.cs
@@ -43,7 +43,7 @@ public static void DrawLineSeparator(string label = null)
         public static Texture2D LoadIcon(string name)
         {
             var skinPrefix = EditorGUIUtility.isProSkin ? "d_" : "";
-            var scale = Mathf.Clamp((int)EditorGUIUtility.pixelsPerPoint, 0, 4);
+            var scale = Mathf.Clamp(Mathf.CeilToInt(EditorGUIUtility.pixelsPerPoint), 0, 4);
             var scalePostFix = scale > 1 ? $"@{scale}x" : "";
             if (name.IndexOfAny(Path.GetInvalidFileNameChars()) > -1)
                 name = string.Join("_", name.Split(Path.GetInvalidFileNameChars()));
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ContextMenu.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ContextMenu.cs
@@ -25,6 +25,21 @@ internal static class ContextMenu
         private static readonly string add_Binding_String = "Add Binding";
 
         #region ActionMaps
+        // Determine whether current clipboard contents can can pasted into the ActionMaps view
+        //
+        //  can always paste an ActionMap
+        //  need an existing map to be able to paste an Action
+        //
+        private static bool CanPasteIntoActionMaps(ActionMapsView mapView)
+        {
+            bool haveMap = mapView.GetMapCount() > 0;
+            var copiedType = CopyPasteHelper.GetCopiedClipboardType();
+            bool copyIsMap = copiedType == typeof(InputActionMap);
+            bool copyIsAction = copiedType == typeof(InputAction);
+            bool hasPastableData = (copyIsMap || (copyIsAction && haveMap));
+            return hasPastableData;
+        }
+
         public static void GetContextMenuForActionMapItem(ActionMapsView mapView, InputActionMapsTreeViewItem treeViewItem, int index)
         {
             treeViewItem.OnContextualMenuPopulateEvent = (menuEvent =>
@@ -39,9 +54,15 @@ public static void GetContextMenuForActionMapItem(ActionMapsView mapView, InputA
                 menuEvent.menu.AppendAction(copy_String, _ => mapView.CopyItems());
                 menuEvent.menu.AppendAction(cut_String, _ => mapView.CutItems());
 
-                var copiedAction = CopyPasteHelper.GetCopiedClipboardType() == typeof(InputAction);
-                if (CopyPasteHelper.HasPastableClipboardData(typeof(InputActionMap)))
-                    menuEvent.menu.AppendAction(paste_String, _ => mapView.PasteItems(copiedAction));
+                if (CanPasteIntoActionMaps(mapView))
+                {
+                    bool copyIsAction = CopyPasteHelper.GetCopiedClipboardType() == typeof(InputAction);
+                    if (CopyPasteHelper.HasPastableClipboardData(typeof(InputActionMap)))
+                        menuEvent.menu.AppendAction(paste_String, _ => mapView.PasteItems(copyIsAction));
+                }
+
+                menuEvent.menu.AppendSeparator();
+                menuEvent.menu.AppendAction(add_Action_Map_String, _ => mapView.AddActionMap());
             });
         }
 
@@ -51,27 +72,60 @@ public static void GetContextMenuForActionMapsEmptySpace(ActionMapsView mapView,
         {
             _ = new ContextualMenuManipulator(menuEvent =>
             {
-                var copiedAction = CopyPasteHelper.GetCopiedClipboardType() == typeof(InputAction);
-                if (CopyPasteHelper.HasPastableClipboardData(typeof(InputActionMap)))
-                    menuEvent.menu.AppendAction(paste_String, _ => mapView.PasteItems(copiedAction));
-
-                menuEvent.menu.AppendSeparator();
+                if (CanPasteIntoActionMaps(mapView))
+                {
+                    bool copyIsAction = CopyPasteHelper.GetCopiedClipboardType() == typeof(InputAction);
+                    menuEvent.menu.AppendAction(paste_String, _ => mapView.PasteItems(copyIsAction));
+                    menuEvent.menu.AppendSeparator();
+                }
                 menuEvent.menu.AppendAction(add_Action_Map_String, _ => mapView.AddActionMap());
             }) { target = element };
         }
 
         #endregion
 
         #region Actions
+        // Determine whether current clipboard contents can pasted into the Actions TreeView
+        //
+        //  item selected   => can paste either Action or Binding (depends on selected item context)
+        //  empty view      => can only paste Action
+        //  no selection    => can only paste Action
+        //
+        private static bool CanPasteIntoActions(TreeView treeView)
+        {
+            bool hasPastableData = false;
+            bool selected = treeView.selectedIndex != -1;
+            if (selected)
+            {
+                var item = treeView.GetItemDataForIndex<ActionOrBindingData>(treeView.selectedIndex);
+                var itemType = item.isAction ? typeof(InputAction) : typeof(InputBinding);
+                hasPastableData = CopyPasteHelper.HasPastableClipboardData(itemType);
+            }
+            else
+            {
+                // Cannot paste Binding when no Action is selected or into an empty view
+                bool copyIsBinding = CopyPasteHelper.GetCopiedClipboardType() == typeof(InputBinding);
+                hasPastableData = !copyIsBinding && CopyPasteHelper.HasPastableClipboardData(typeof(InputAction));
+            }
+            return hasPastableData;
+        }
+
         // Add the "Paste" option to all elements in the Action area.
         public static void GetContextMenuForActionListView(ActionsTreeView actionsTreeView, TreeView treeView, VisualElement target)
         {
             _ = new ContextualMenuManipulator(menuEvent =>
             {
-                var item = treeView.GetItemDataForIndex<ActionOrBindingData>(treeView.selectedIndex);
-                var hasPastableData = CopyPasteHelper.HasPastableClipboardData(item.isAction ? typeof(InputAction) : typeof(InputBinding));
-                if (hasPastableData)
-                    menuEvent.menu.AppendAction(paste_String, _ => actionsTreeView.PasteItems());
+                bool haveMap = actionsTreeView.GetMapCount() > 0;
+                if (haveMap)
+                {
+                    bool hasPastableData = CanPasteIntoActions(treeView);
+                    if (hasPastableData)
+                    {
+                        menuEvent.menu.AppendAction(paste_String, _ => actionsTreeView.PasteItems());
+                    }
+                    menuEvent.menu.AppendSeparator();
+                    menuEvent.menu.AppendAction(add_Action_String, _ => actionsTreeView.AddAction());
+                }
             }) { target = target };
         }
 
@@ -81,13 +135,15 @@ public static void GetContextMenuForActionsEmptySpace(ActionsTreeView actionsTre
         {
             _ = new ContextualMenuManipulator(menuEvent =>
             {
-                if (actionsTreeView.GetMapCount() > 0 && (!onlyShowIfTreeIsEmpty || treeView.GetTreeCount() == 0))
+                bool haveMap = actionsTreeView.GetMapCount() > 0;
+                if (haveMap && (!onlyShowIfTreeIsEmpty || treeView.GetTreeCount() == 0))
                 {
-                    var item = treeView.GetItemDataForIndex<ActionOrBindingData>(treeView.selectedIndex);
-                    if (CopyPasteHelper.HasPastableClipboardData(item.isAction ? typeof(InputAction) : typeof(InputBinding)))
+                    bool hasPastableData = CanPasteIntoActions(treeView);
+                    if (hasPastableData)
+                    {
                         menuEvent.menu.AppendAction(paste_String, _ => actionsTreeView.PasteItems());
-
-                    menuEvent.menu.AppendSeparator();
+                        menuEvent.menu.AppendSeparator();
+                    }
                     menuEvent.menu.AppendAction(add_Action_String, _ => actionsTreeView.AddAction());
                 }
             }) { target = target };
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CopyPasteHelper.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CopyPasteHelper.cs
@@ -266,8 +266,17 @@ private static void PasteBlocks(string transmission, int indexToInsert, Serializ
             {
                 var actionName = Selectors.GetSelectedBinding(s_State)?.wrappedProperty.FindPropertyRelative("m_Action")
                     .stringValue;
+
                 if (s_State.selectionType == SelectionType.Action)
-                    actionName = PropertyName(Selectors.GetSelectedAction(s_State)?.wrappedProperty);
+                {
+                    SerializedProperty property = Selectors.GetSelectedAction(s_State)?.wrappedProperty;
+                    if (property == null)
+                        return;
+                    actionName = PropertyName(property);
+                }
+                if (actionName == null)
+                    return;
+
                 PasteBindingOrComposite(arrayToInsertInto, block, indexToInsert, actionName);
             }
         }
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/InputActionsEditorView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/InputActionsEditorView.cs
@@ -138,6 +138,18 @@ public override void RedrawUI(ViewState viewState)
             m_SaveButton.SetEnabled(InputEditorUserSettings.autoSaveInputActionAssets == false);
         }
 
+        private string SetupControlSchemeName(string name)
+        {
+            //On Windows the '&' is considered an accelerator character and will always be stripped.
+            //Since the ControlScheme menu isn't creating hotkeys, it can be safely assumed that they are meant to be text
+            //so we want to escape the character for MenuItem
+            if (Application.platform == RuntimePlatform.WindowsEditor)
+            {
+                name = name.Replace("&", "&&");
+            }
+            return name;
+        }
+
         private void SetUpControlSchemesMenu(ViewState viewState)
         {
             m_ControlSchemesToolbar.menu.MenuItems().Clear();
@@ -151,7 +163,7 @@ private void SetUpControlSchemesMenu(ViewState viewState)
                 m_ControlSchemesToolbar.menu.AppendAction("All Control Schemes", _ => SelectControlScheme(-1),
                     viewState.selectedControlSchemeIndex == -1 ? DropdownMenuAction.Status.Checked : DropdownMenuAction.Status.Normal);
                 viewState.controlSchemes.ForEach((scheme, i) =>
-                    m_ControlSchemesToolbar.menu.AppendAction(scheme.name, _ => SelectControlScheme(i),
+                    m_ControlSchemesToolbar.menu.AppendAction(SetupControlSchemeName(scheme.name), _ => SelectControlScheme(i),
                         viewState.selectedControlSchemeIndex == i ? DropdownMenuAction.Status.Checked : DropdownMenuAction.Status.Normal));
                 m_ControlSchemesToolbar.menu.AppendSeparator();
             }

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public static void DrawLineSeparator(string label = null)`
`43`	`43`	`public static Texture2D LoadIcon(string name)`
`44`	`44`	`{`
`45`	`45`	`var skinPrefix = EditorGUIUtility.isProSkin ? "d_" : "";`
`46`		`- var scale = Mathf.Clamp((int)EditorGUIUtility.pixelsPerPoint, 0, 4);`
	`46`	`+ var scale = Mathf.Clamp(Mathf.CeilToInt(EditorGUIUtility.pixelsPerPoint), 0, 4);`
`47`	`47`	`var scalePostFix = scale > 1 ? $"@{scale}x" : "";`
`48`	`48`	`if (name.IndexOfAny(Path.GetInvalidFileNameChars()) > -1)`
`49`	`49`	`name = string.Join("_", name.Split(Path.GetInvalidFileNameChars()));`
Original file line number	Diff line number	Diff line change
`@@ -266,8 +266,17 @@ private static void PasteBlocks(string transmission, int indexToInsert, Serializ`
`266`	`266`	`{`
`267`	`267`	`var actionName = Selectors.GetSelectedBinding(s_State)?.wrappedProperty.FindPropertyRelative("m_Action")`
`268`	`268`	`.stringValue;`
	`269`	`+`
`269`	`270`	`if (s_State.selectionType == SelectionType.Action)`
`270`		`- actionName = PropertyName(Selectors.GetSelectedAction(s_State)?.wrappedProperty);`
	`271`	`+ {`
	`272`	`+ SerializedProperty property = Selectors.GetSelectedAction(s_State)?.wrappedProperty;`
	`273`	`+ if (property == null)`
	`274`	`+ return;`
	`275`	`+ actionName = PropertyName(property);`
	`276`	`+ }`
	`277`	`+ if (actionName == null)`
	`278`	`+ return;`
	`279`	`+`
`271`	`280`	`PasteBindingOrComposite(arrayToInsertInto, block, indexToInsert, actionName);`
`272`	`281`	`}`
`273`	`282`	`}`