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

Merge branches 'pseudo-classes', 'input-refactor' and '19-08-21-update-submodule'

Browse Source
This commit is contained in:
Pieter-Jan Briers
2019-08-21 17:25:01 +02:00
parent 6ca70b0156 66c5affa65 6e6aef62c6
commit c207297c57
57 changed files with 301 additions and 374 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Content.Client/UserInterface/HandsGui.cs
View File

@@ -2,6 +2,7 @@
using Content.Client.GameObjects.EntitySystems;
using Content.Client.Interfaces.GameObjects;
using Content.Client.Utility;
using Content.Shared.Input;
using Robust.Client.Graphics;
using Robust.Client.Input;
using Robust.Client.Interfaces.GameObjects.Components;
@@ -9,6 +10,7 @@ using Robust.Client.Interfaces.ResourceManagement;
using Robust.Client.Player;
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls;
using Robust.Shared.Input;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
@@ -199,12 +201,17 @@ namespace Content.Client.UserInterface
return _handL.Contains((Vector2i) point) || _handR.Contains((Vector2i) point);
}
protected override void MouseDown(GUIMouseButtonEventArgs args)
protected override void KeyBindDown(GUIBoundKeyEventArgs args)
{
base.MouseDown(args);
base.KeyBindDown(args);
var leftHandContains = _handL.Contains((Vector2i) args.RelativePosition);
var rightHandContains = _handR.Contains((Vector2i) args.RelativePosition);
if (!args.CanFocus)
{
return;
}
var leftHandContains = _handL.Contains((Vector2i)args.RelativePosition);
var rightHandContains = _handR.Contains((Vector2i)args.RelativePosition);
string handIndex;
if (leftHandContains)
@@ -220,7 +227,7 @@ namespace Content.Client.UserInterface
return;
}
if (args.Button == Mouse.Button.Left)
if (args.Function == EngineKeyFunctions.Use)
{
if (!TryGetHands(out var hands))
return;
@@ -236,12 +243,12 @@ namespace Content.Client.UserInterface
}
}
else if (args.Button == Mouse.Button.Middle)
else if (args.Function == ContentKeyFunctions.MouseMiddle)
{
SendSwitchHandTo(handIndex);
}
else if (args.Button == Mouse.Button.Right)
else if (args.Function == ContentKeyFunctions.OpenContextMenu)
{
if (!TryGetHands(out var hands))
{
@@ -255,7 +262,7 @@ namespace Content.Client.UserInterface
}
var esm = IoCManager.Resolve<IEntitySystemManager>();
esm.GetEntitySystem<VerbSystem>().OpenContextMenu(entity, new ScreenCoordinates(args.GlobalPosition));
esm.GetEntitySystem<VerbSystem>().OpenContextMenu(entity, new ScreenCoordinates(args.PointerLocation.Position));
}
}
}