Skip to content

Fix virtual cursor "jumping" after disabling/reenabling when a canvas scaler is applied by also applying the scaling on enable #2485

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

Open
Tak wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix virtual cursor "jumping" after disabling/reenabling when a canvas scaler is applied by also applying the scaling on enable #2485

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 33 additions & 2 deletions Packages/com.unity.inputsystem/InputSystem/Runtime/Plugins/UI/VirtualMouseInput.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,23 @@ public InputActionProperty scrollWheelAction
set => SetAction(ref m_ScrollWheelAction, value);
}

// calculate the scale factor for the applied canvas scaler
private Vector2 canvasScale
{
get
{
var resolutionXScale = 1f;
var resolutionYScale = 1f;
if (m_Canvas != null && m_CanvasScaler != null)
{
resolutionXScale = m_Canvas.pixelRect.xMax / m_CanvasScaler.referenceResolution.x;
resolutionYScale = m_Canvas.pixelRect.yMax / m_CanvasScaler.referenceResolution.y;
}

return new Vector2(resolutionXScale, resolutionYScale);
}
}

protected void OnEnable()
{
// Hijack system mouse, if enabled.
Expand All @@ -296,7 +313,7 @@ protected void OnEnable()
// Set initial cursor position.
if (m_CursorTransform != null)
{
var position = m_CursorTransform.anchoredPosition;
var position = AnchoredPositionToScreen(m_CursorTransform.anchoredPosition);
InputState.Change(m_VirtualMouse.position, position);
m_SystemMouse?.WarpCursorPosition(position);
}
Expand Down Expand Up @@ -462,7 +479,7 @@ private void UpdateMotion()
(m_CursorMode == CursorMode.SoftwareCursor ||
(m_CursorMode == CursorMode.HardwareCursorIfAvailable && m_SystemMouse == null)))
{
m_CursorTransform.anchoredPosition = m_CanvasScaler == null ? newPosition : new Vector2(newPosition.x / resolutionXScale, newPosition.y / resolutionYScale);
m_CursorTransform.anchoredPosition = ScreenPositionToAnchored(newPosition);
}

m_LastStickValue = stickValue;
Expand Down Expand Up @@ -601,6 +618,20 @@ private void OnAfterInputUpdate()
UpdateMotion();
}

// convert to anchored position applying canvas scaling
private Vector2 ScreenPositionToAnchored(Vector2 canvasPosition)
{
var scale = canvasScale;
return new Vector2(canvasPosition.x / scale.x, canvasPosition.y / scale.y);
}

// convert to screen position applying canvas scaling
private Vector2 AnchoredPositionToScreen(Vector2 anchoredPosition)
{
var scale = canvasScale;
return new Vector2(anchoredPosition.x * scale.x, anchoredPosition.y * scale.y);
}

/// <summary>
/// Determines how the cursor for the virtual mouse is represented.
/// </summary>
Expand Down