Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Multi-window input handling. (#3911)

Browse Source
This commit is contained in:
Pieter-Jan Briers
2021-05-02 20:48:00 +02:00
committed by GitHub
parent 31c5b18fe2
commit d796dcfcca
12 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Client/Utility/DragDropHelper.cs
View File

@@ -1,6 +1,6 @@
using Robust.Client.Input;
using Robust.Shared.IoC;
using Robust.Shared.Maths;
using Robust.Shared.Map;
namespace Content.Client.Utility
{
@@ -33,7 +33,7 @@ namespace Content.Client.Utility
/// <summary>
/// Convenience method, current mouse screen position as provided by inputmanager.
/// </summary>
public Vector2 MouseScreenPosition => _inputManager.MouseScreenPosition;
public ScreenCoordinates MouseScreenPosition => _inputManager.MouseScreenPosition;
/// <summary>
/// True if initiated a drag and currently dragging something.
@@ -48,7 +48,7 @@ namespace Content.Client.Utility
public T? Dragged { get; private set; }
// screen pos where the mouse down began for the drag
private Vector2 _mouseDownScreenPos;
private ScreenCoordinates _mouseDownScreenPos;
private DragState _state = DragState.NotDragging;
private enum DragState : byte
@@ -128,7 +128,7 @@ namespace Content.Client.Utility
case DragState.MouseDown:
{
var screenPos = _inputManager.MouseScreenPosition;
if ((_mouseDownScreenPos - screenPos).Length > _deadzone)
if ((_mouseDownScreenPos.Position - screenPos.Position).Length > _deadzone)
{
StartDragging();
}