Skip to content

FIX: Make displayIndex usable for PenState #1976

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

Closed
wants to merge 8 commits into from
Closed

FIX: Make displayIndex usable for PenState #1976

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1fe3a18
Make displayIndex usable for PenState
brice-gros Aug 1, 2024
44c6c9a
Merge branch 'develop' into use-penstate-displayIndex
brice-gros Sep 16, 2024
c7c7f1f
Merge branch 'develop' into use-penstate-displayIndex
brice-gros Sep 24, 2024
d090e35
Update CHANGELOG
brice-gros Oct 2, 2024
7beea86
Merge branch 'develop' into use-penstate-displayIndex
brice-gros Oct 22, 2024
176c431
Merge branch 'develop' into use-penstate-displayIndex
brice-gros Nov 4, 2024
b3283b3
Merge branch 'develop' into use-penstate-displayIndex
ekcoh Nov 5, 2024
0052a82
Merge branch 'develop' into use-penstate-displayIndex
brice-gros Nov 18, 2024
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
7 changes: 5 additions & 2 deletions Packages/com.unity.inputsystem/InputSystem/Devices/Pen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,10 @@ public struct PenState : IInputStateTypeInfo
[FieldOffset(32)]
public ushort buttons;

// Not currently used, but still needed in this struct for padding,
// as il2cpp does not implement FieldOffset.
/// <summary>
/// The index of the display that was touched.
/// </summary>
[InputControl(name = "displayIndex", displayName = "Display Index", layout = "Integer")]
[FieldOffset(34)]
ushort displayIndex;

Expand Down Expand Up @@ -379,6 +381,7 @@ protected override void FinishSetup()
inRange = GetChildControl<ButtonControl>("inRange");
tilt = GetChildControl<Vector2Control>("tilt");
twist = GetChildControl<AxisControl>("twist");
displayIndex = GetChildControl<IntegerControl>("displayIndex");
base.FinishSetup();
}
}
Expand Down
2 changes: 1 addition & 1 deletion Packages/com.unity.inputsystem/InputSystem/Plugins/InputForUI/InputSystemProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@ void OnPointerPerformed(InputAction.CallbackContext ctx)
m_SeenPenEvents = true;

var positionISX = ctx.ReadValue<Vector2>();
var targetDisplay = asPointerDevice != null ? asPointerDevice.displayIndex.ReadValue() : (asTouchscreenDevice != null ? asTouchscreenDevice.displayIndex.ReadValue() : 0);
var targetDisplay = asPointerDevice != null ? asPointerDevice.displayIndex.ReadValue() : (asTouchscreenDevice != null ? asTouchscreenDevice.displayIndex.ReadValue() : (asPenDevice != null ? asPenDevice.displayIndex.ReadValue() : 0));
var position = ScreenBottomLeftToPanelPosition(positionISX, targetDisplay);
var delta = pointerState.LastPositionValid ? position - pointerState.LastPosition : Vector2.zero;

Expand Down