Skip to content

Commit 32aee68

Browse files
jamesmcgillDmytro Ivanovjfreire-unity
authored
NEW: Add InputSystemProvider for InputForUI (#1679)
* Adding dependency to a provider package * wip * wip * wip * wip * wip * wip * sorting of events and filtering of pointer events * pointer indices * more robust scroll events * forgot to reset state flags * trying out to use touchscreen for finger index * removing leftovers * Add dispatch of navigation events for InputForUI (#1667) * Add dispatch of navigation events * Fix formatting * Unifies GetEventSource() for callback context and devices * Use DispatchFromCallback and clean todos * InputForUI: Add repetition for Next/Previous navigation events (#1670) * Update renaming of Event.CompareType * Add Next/Previous navigation events repetition Currently it doesn't deal with keys other than tab and shift+tab. Discussion needs to happen to allow configuration for this with the Input System. * Set seenTouchEvents and seenTouchEvents for missing control paths and events (#1674) * fix compilation errors when opening InputSystem project * fix compilation errors when opening project in older editors * Bootstrap InputForUI provider only if enabled in the PlayerSettings (ISX-1386) * Fix null reference errors by not initializing InputForUI in the editor (ISX-1397) * Fix to avoid PointerEvents from Mouse when using Touch * Reverse bool logic of resetSeenEventsOnUpdate * Remove debug logs * Fix PointerEvents with same pointerIndex for all fingers * fix InputForUI not being bootstrapped in IL2CPP builds (ISX-1424) * fix for deprecated warning * fix for unused variable warning * run formatting tool * modify naming to conform to coding convention * fix for running tests in standalone builds * Remove commented code and add missing comment --------- Co-authored-by: Dmytro Ivanov <[email protected]> Co-authored-by: João <[email protected]>
1 parent 5f02b48 commit 32aee68

File tree

8 files changed

+740
-2
lines changed

8 files changed

+740
-2
lines changed

Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/InputActionsTreeViewItem.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ private void OnKeyDownEventForRename(KeyDownEvent e)
6161
return;
6262

6363
FocusOnRenameTextField();
64-
e.PreventDefault();
64+
e.StopPropagation();
6565
}
6666

6767
private void OnMouseDownEventForRename(MouseDownEvent e)
@@ -70,7 +70,6 @@ private void OnMouseDownEventForRename(MouseDownEvent e)
7070
return;
7171

7272
FocusOnRenameTextField();
73-
7473
e.StopPropagation();
7574
}
7675

Packages/com.unity.inputsystem/InputSystem/Plugins/InputForUI.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
using System.Runtime.CompilerServices;
2+
using UnityEngine.Scripting;
3+
4+
[assembly: InternalsVisibleTo("UnityEngine.InputForUIVisualizer")]
5+
[assembly: AlwaysLinkAssembly]

Packages/com.unity.inputsystem/InputSystem/Plugins/InputForUI/AssemblyInfo.cs.meta

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"name": "Unity.InputSystem.ForUI",
3+
"references": [
4+
"Unity.InputSystem"
5+
],
6+
"includePlatforms": [],
7+
"excludePlatforms": [],
8+
"allowUnsafeCode": false,
9+
"overrideReferences": false,
10+
"precompiledReferences": [],
11+
"autoReferenced": true,
12+
"defineConstraints": [],
13+
"versionDefines": [],
14+
"noEngineReferences": false
15+
}

Packages/com.unity.inputsystem/InputSystem/Plugins/InputForUI/InputSystemForUI.asmdef.meta

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)