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

4
Content.Client/ClientNotifyManager.cs
View File

@@ -104,14 +104,14 @@ namespace Content.Client
label.Measure(Vector2.Infinity); label.Measure(Vector2.Infinity);
var minimumSize = label.DesiredSize; var minimumSize = label.DesiredSize;
label.InitialPos = (coordinates.Position / _userInterfaceManager.UIScale) - minimumSize / 2; label.InitialPos = (coordinates.Position / label.UIScale) - minimumSize / 2;
LayoutContainer.SetPosition(label, label.InitialPos); LayoutContainer.SetPosition(label, label.InitialPos);
_aliveLabels.Add(label); _aliveLabels.Add(label);
} }
public void PopupMessage(string message) public void PopupMessage(string message)
{ {
PopupMessage(new ScreenCoordinates(_userInterfaceManager.MousePositionScaled), message); PopupMessage(_userInterfaceManager.MousePositionScaled, message);
} }
public void FrameUpdate(FrameEventArgs eventArgs) public void FrameUpdate(FrameEventArgs eventArgs)

2
Content.Client/GameObjects/EntitySystems/DoAfter/DoAfterGui.cs
View File

@@ -210,7 +210,7 @@ namespace Content.Client.GameObjects.EntitySystems.DoAfter
} }
var screenCoordinates = _eyeManager.CoordinatesToScreen(AttachedEntity.Transform.Coordinates); var screenCoordinates = _eyeManager.CoordinatesToScreen(AttachedEntity.Transform.Coordinates);
_playerPosition = new ScreenCoordinates(screenCoordinates.X / UIScale, screenCoordinates.Y / UIScale); _playerPosition = new ScreenCoordinates(screenCoordinates.Position / UIScale, screenCoordinates.Window);
LayoutContainer.SetPosition(this, new Vector2(_playerPosition.X - Width / 2, _playerPosition.Y - Height - 30.0f)); LayoutContainer.SetPosition(this, new Vector2(_playerPosition.X - Width / 2, _playerPosition.Y - Height - 30.0f));
} }
} }

2
Content.Client/GameObjects/EntitySystems/ExamineSystem.cs
View File

@@ -96,7 +96,7 @@ namespace Content.Client.GameObjects.EntitySystems
panel.Measure(Vector2.Infinity); panel.Measure(Vector2.Infinity);
var size = Vector2.ComponentMax((minWidth, 0), panel.DesiredSize); var size = Vector2.ComponentMax((minWidth, 0), panel.DesiredSize);
_examineTooltipOpen.Open(UIBox2.FromDimensions(popupPos, size)); _examineTooltipOpen.Open(UIBox2.FromDimensions(popupPos.Position, size));
FormattedMessage message; FormattedMessage message;
if (entity.Uid.IsClientSide()) if (entity.Uid.IsClientSide())

2
Content.Client/GameObjects/EntitySystems/HealthOverlay/HealthOverlayGui.cs
View File

@@ -147,7 +147,7 @@ namespace Content.Client.GameObjects.EntitySystems.HealthOverlay
Visible = true; Visible = true;
var screenCoordinates = _eyeManager.CoordinatesToScreen(Entity.Transform.Coordinates); var screenCoordinates = _eyeManager.CoordinatesToScreen(Entity.Transform.Coordinates);
var playerPosition = new ScreenCoordinates(screenCoordinates.X / UIScale, screenCoordinates.Y / UIScale); var playerPosition = UserInterfaceManager.ScreenToUIPosition(screenCoordinates);
LayoutContainer.SetPosition(this, new Vector2(playerPosition.X - Width / 2, playerPosition.Y - Height - 30.0f)); LayoutContainer.SetPosition(this, new Vector2(playerPosition.X - Width / 2, playerPosition.Y - Height - 30.0f));
} }

2
Content.Client/GameObjects/EntitySystems/VerbSystem.cs
View File

@@ -119,7 +119,7 @@ namespace Content.Client.GameObjects.EntitySystems
public void OnContextButtonPressed(IEntity entity) public void OnContextButtonPressed(IEntity entity)
{ {
OpenContextMenu(entity, new ScreenCoordinates(_userInterfaceManager.MousePositionScaled)); OpenContextMenu(entity, _userInterfaceManager.MousePositionScaled);
} }
private void FillEntityPopup(VerbSystemMessages.VerbsResponseMessage msg) private void FillEntityPopup(VerbSystemMessages.VerbsResponseMessage msg)

2
Content.Client/State/GameScreenBase.cs
View File

@@ -72,7 +72,7 @@ namespace Content.Client.State
var renderScale = 1; var renderScale = 1;
if (UserInterfaceManager.CurrentlyHovered is IViewportControl vp) if (UserInterfaceManager.CurrentlyHovered is IViewportControl vp)
{ {
var mousePosWorld = vp.ScreenToMap(InputManager.MouseScreenPosition); var mousePosWorld = vp.ScreenToMap(InputManager.MouseScreenPosition.Position);
entityToClick = GetEntityUnderPosition(mousePosWorld); entityToClick = GetEntityUnderPosition(mousePosWorld);
if (vp is ScalingViewport svp) if (vp is ScalingViewport svp)

4
Content.Client/UserInterface/ActionMenu.cs
View File

@@ -198,14 +198,14 @@ namespace Content.Client.UserInterface
{ {
_dragShadow.Texture = _dragDropHelper.Dragged!.Action.Icon.Frame0(); _dragShadow.Texture = _dragDropHelper.Dragged!.Action.Icon.Frame0();
// don't make visible until frameupdate, otherwise it'll flicker // don't make visible until frameupdate, otherwise it'll flicker
LayoutContainer.SetPosition(_dragShadow, UserInterfaceManager.MousePositionScaled - (32, 32)); LayoutContainer.SetPosition(_dragShadow, UserInterfaceManager.MousePositionScaled.Position - (32, 32));
return true; return true;
} }
private bool OnContinueActionDrag(float frameTime) private bool OnContinueActionDrag(float frameTime)
{ {
// keep dragged entity centered under mouse // keep dragged entity centered under mouse
LayoutContainer.SetPosition(_dragShadow, UserInterfaceManager.MousePositionScaled - (32, 32)); LayoutContainer.SetPosition(_dragShadow, UserInterfaceManager.MousePositionScaled.Position - (32, 32));
// we don't set this visible until frameupdate, otherwise it flickers // we don't set this visible until frameupdate, otherwise it flickers
_dragShadow.Visible = true; _dragShadow.Visible = true;
return true; return true;

4
Content.Client/UserInterface/ActionsUI.cs
View File

@@ -533,7 +533,7 @@ namespace Content.Client.UserInterface
if (Locked || DragDropHelper.Dragged?.Action == null) return false; if (Locked || DragDropHelper.Dragged?.Action == null) return false;
_dragShadow.Texture = DragDropHelper.Dragged.Action.Icon.Frame0(); _dragShadow.Texture = DragDropHelper.Dragged.Action.Icon.Frame0();
LayoutContainer.SetPosition(_dragShadow, UserInterfaceManager.MousePositionScaled - (32, 32)); LayoutContainer.SetPosition(_dragShadow, UserInterfaceManager.MousePositionScaled.Position - (32, 32));
DragDropHelper.Dragged.CancelPress(); DragDropHelper.Dragged.CancelPress();
return true; return true;
} }
@@ -544,7 +544,7 @@ namespace Content.Client.UserInterface
if (Locked || DragDropHelper.Dragged?.Action == null) return false; if (Locked || DragDropHelper.Dragged?.Action == null) return false;
// keep dragged entity centered under mouse // keep dragged entity centered under mouse
LayoutContainer.SetPosition(_dragShadow, UserInterfaceManager.MousePositionScaled - (32, 32)); LayoutContainer.SetPosition(_dragShadow, UserInterfaceManager.MousePositionScaled.Position - (32, 32));
// we don't set this visible until frameupdate, otherwise it flickers // we don't set this visible until frameupdate, otherwise it flickers
_dragShadow.Visible = true; _dragShadow.Visible = true;
return true; return true;

2
Content.Client/UserInterface/ContextMenu/ContextMenuView.cs
View File

@@ -79,7 +79,7 @@ namespace Content.Client.UserInterface.ContextMenu
_userInterfaceManager.ModalRoot.AddChild(rootContextMenu); _userInterfaceManager.ModalRoot.AddChild(rootContextMenu);
var size = rootContextMenu.List.CombinedMinimumSize; var size = rootContextMenu.List.CombinedMinimumSize;
var box = UIBox2.FromDimensions(_userInterfaceManager.MousePositionScaled, size); var box = UIBox2.FromDimensions(_userInterfaceManager.MousePositionScaled.Position, size);
rootContextMenu.Open(box); rootContextMenu.Open(box);
} }
public void AddChildMenu(IEnumerable<IEntity> entities, Vector2 position, StackContextElement? stack) public void AddChildMenu(IEnumerable<IEntity> entities, Vector2 position, StackContextElement? stack)

2
Content.Client/UserInterface/ItemSlotManager.cs
View File

@@ -59,7 +59,7 @@ namespace Content.Client.UserInterface
else if (args.Function == ContentKeyFunctions.OpenContextMenu) else if (args.Function == ContentKeyFunctions.OpenContextMenu)
{ {
_entitySystemManager.GetEntitySystem<VerbSystem>() _entitySystemManager.GetEntitySystem<VerbSystem>()
.OpenContextMenu(item, new ScreenCoordinates(_uiMgr.ScreenToUIPosition(args.PointerLocation))); .OpenContextMenu(item, _uiMgr.ScreenToUIPosition(args.PointerLocation));
} }
else if (args.Function == ContentKeyFunctions.ActivateItemInWorld) else if (args.Function == ContentKeyFunctions.ActivateItemInWorld)
{ {

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

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

2
RobustToolbox

Submodule RobustToolbox updated: 7c008e857d...5f31036ab2