0.2.1-preview - 2019/03/12

@2018.3
ErikMoczi · Mar 14, 2019 · 9e0c70d · 9e0c70d
1 parent 98b5160
commit 9e0c70d
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 15 deletions.
diff --git a/package/CHANGELOG.md b/package/CHANGELOG.md
@@ -3,6 +3,9 @@ All notable changes to the input system package will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+## [0.2.1-preview] - 2019-03-11
+### Changed
+ - NativeUpdateCallback API update to match Unity 2018.3.8f1
 
 ## [0.2.0-preview] - 2019-02-12
 

diff --git a/package/InputSystem/AssemblyInfo.cs b/package/InputSystem/AssemblyInfo.cs
@@ -4,7 +4,7 @@
 // Keep this in sync with "Packages/com.unity.inputsystem/package.json".
 // NOTE: Unfortunately, System.Version doesn't use semantic versioning so we can't include
 //       "-preview" suffixes here.
-[assembly: AssemblyVersion("0.2.0")]
+[assembly: AssemblyVersion("0.2.1")]
 
 [assembly: InternalsVisibleTo("Unity.InputSystem.Tests.Editor")]
 [assembly: InternalsVisibleTo("Unity.InputSystem.Tests")]
diff --git a/package/InputSystem/Editor/InputActionAsset/AssetInspectorWindow.cs b/package/InputSystem/Editor/InputActionAsset/AssetInspectorWindow.cs
@@ -471,13 +471,15 @@ private void DrawActionsColumn(float width)
 
             labelRect.x = labelRect.x + labelRect.width - (EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing);
             labelRect.width = EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing;
-            if (GUI.Button(labelRect, m_AddActionIconGUI, GUIStyle.none))
+            using (new EditorGUI.DisabledScope(m_ActionMapsTree.GetSelectedRow() == null))
             {
-                m_ContextMenu.OnAddAction();
-                m_ContextMenu.OnAddBinding(m_ActionsTree.GetSelectedAction());
-                m_ActionsTree.SelectNewActionRow();
+                if (GUI.Button(labelRect, m_AddActionIconGUI, GUIStyle.none))
+                {
+                    m_ContextMenu.OnAddAction();
+                    m_ContextMenu.OnAddBinding(m_ActionsTree.GetSelectedAction());
+                    m_ActionsTree.SelectNewActionRow();
+                }
             }
-
             // Draw border rect
             EditorGUI.LabelField(columnRect, GUIContent.none, Styles.propertiesBackground);
             // Compensate for the border rect
@@ -558,6 +560,11 @@ private void DrawInteractivePickingOverlay(Rect rect)
                 m_BindingPropertyView.CancelInteractivePicking();
                 Repaint();
             }
+
+            // Eat key events to supress the editor from passing them to the OS 
+            // (causing beeps or menu commands being triggered).
+            if (Event.current.isKey)
+                Event.current.Use();            
         }
 
         public static void RefreshAllOnAssetReimport()

diff --git a/package/InputSystem/NativeInputRuntime.cs b/package/InputSystem/NativeInputRuntime.cs
@@ -98,7 +98,7 @@ public unsafe InputUpdateDelegate onUpdate
                             eventBufferPtr->sizeInBytes = 0;
                         }
                     };
-                    #elif UNITY_2019_1
+                    #else
                     // 2019.1 has the native API change but we need to fix the code in InputManager first
                     // before we can fully migrate to the new update code. For now, just manually reset
                     // the buffer here every time.
@@ -125,13 +125,6 @@ public unsafe InputUpdateDelegate onUpdate
                             }
                         }
                     };
-                    #else
-                    NativeInputSystem.onUpdate =
-                        (updateType, eventCount, eventPtr) =>
-                    {
-                        var buffer = new InputEventBuffer((InputEvent*)eventPtr, eventCount);
-                        value((InputUpdateType)updateType, ref buffer);
-                    };
                     #endif
                 else
                     NativeInputSystem.onUpdate = null;

diff --git a/package/package.json b/package/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "com.unity.inputsystem",
 	"displayName": "Input System",
-	"version": "0.2.0-preview",
+	"version": "0.2.1-preview",
 	"unity": "2018.3",
 	"repository": {
 		"type": "git",

diff --git a/versions.txt b/versions.txt
@@ -16,3 +16,4 @@
 0.1.1-preview
 0.1.2-preview
 0.2.0-preview
+0.2.1-preview