Merge pull request #9976 from keveleigh/update-controller-mapping-list

Update controller mapping list header and alignment

Author: keveleigh

Assets/MRTK/Core/Inspectors/ControllerPopupWindow.cs

@@ -316,40 +316,13 @@ private void RenderMappingList(List<string> controllerList)
                 return;
             }
 
-            GUIStyle headerStyle = new GUIStyle();
-            headerStyle.richText = true;
-
-            if (currentControllerOption == null || currentControllerTexture == null)
+            using (new EditorGUILayout.VerticalScope())
             {
-                GUILayout.BeginVertical();
-                using (new EditorGUILayout.VerticalScope())
-                {
-                    GUILayout.FlexibleSpace();
-                    EditorGUILayout.LabelField("<b>Controllers affected by this mapping</b>", headerStyle);
-                    for (int i = 0; i < controllerList.Count; i++)
-                    {
-                        EditorGUILayout.LabelField(controllerList[i]);
-                    }
-                }
-                GUILayout.EndVertical();
-            }
-            else
-            {
-                float max_y = currentControllerOption.InputLabelPositions.Max(x => x.y);
-
-                var titleRectPosition = Vector2.up * (max_y + 4 * EditorGUIUtility.singleLineHeight);
-                var titleRectSize = new Vector2(500, EditorGUIUtility.singleLineHeight);
-
-                var titleRect = new Rect(titleRectPosition, titleRectSize);
-                EditorGUI.LabelField(titleRect, "<b>Controllers affected by this mapping</b>", headerStyle);
-
+                GUILayout.FlexibleSpace();
+                EditorGUILayout.LabelField("Controllers affected by this mapping", EditorStyles.boldLabel);
                 for (int i = 0; i < controllerList.Count; i++)
                 {
-                    var rectPosition = Vector2.up * (max_y + (i + 5) * EditorGUIUtility.singleLineHeight);
-                    var rectSize = new Vector2(1000, EditorGUIUtility.singleLineHeight);
-
-                    var labelRect = new Rect(rectPosition, rectSize);
-                    EditorGUI.LabelField(labelRect, controllerList[i]);
+                    EditorGUILayout.LabelField(controllerList[i]);
                 }
             }
         }