Add ctor to KeyEvent and make readonly struct
This commit is contained in:
parent
d7c59e8bd4
commit
72511add3b
|
@ -41,7 +41,7 @@ namespace BizHawk.Bizware.DirectX
|
|||
int e = br.ReadInt32();
|
||||
bool pressed = (e & 0x80000000) != 0;
|
||||
lock (PendingEventList)
|
||||
PendingEventList.Add(new KeyEvent { Key = KeyInput.KeyEnumMap[(Key)(e & 0x7FFFFFFF)], Pressed = pressed });
|
||||
PendingEventList.Add(new KeyEvent(KeyInput.KeyEnumMap[(Key) (e & 0x7FFFFFFF)], pressed));
|
||||
}
|
||||
}
|
||||
catch { }
|
||||
|
|
|
@ -66,8 +66,8 @@ namespace BizHawk.Bizware.DirectX
|
|||
|
||||
foreach (var e in events)
|
||||
{
|
||||
foreach (var k in e.PressedKeys) eventList.Add(new KeyEvent { Key = Mapped(k), Pressed = true });
|
||||
foreach (var k in e.ReleasedKeys) eventList.Add(new KeyEvent { Key = Mapped(k), Pressed = false });
|
||||
foreach (var k in e.PressedKeys) eventList.Add(new KeyEvent(Mapped(k), pressed: true));
|
||||
foreach (var k in e.ReleasedKeys) eventList.Add(new KeyEvent(Mapped(k), pressed: false));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -4,10 +4,16 @@ using OpenTK.Input;
|
|||
|
||||
namespace BizHawk.Client.Common
|
||||
{
|
||||
public struct KeyEvent
|
||||
public readonly struct KeyEvent
|
||||
{
|
||||
public Key Key;
|
||||
public readonly Key Key;
|
||||
|
||||
public bool Pressed;
|
||||
public readonly bool Pressed;
|
||||
|
||||
public KeyEvent(Key key, bool pressed)
|
||||
{
|
||||
Key = key;
|
||||
Pressed = pressed;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -46,9 +46,9 @@ namespace BizHawk.Client.EmuHawk
|
|||
foreach (var key in KeyList)
|
||||
{
|
||||
if (lastState.IsKeyUp(key) && _kbState.IsKeyDown(key))
|
||||
EventList.Add(new KeyEvent { Key = key, Pressed = true });
|
||||
EventList.Add(new KeyEvent(key, pressed: true));
|
||||
else if (lastState.IsKeyDown(key) && _kbState.IsKeyUp(key))
|
||||
EventList.Add(new KeyEvent { Key = key, Pressed = false });
|
||||
EventList.Add(new KeyEvent(key, pressed: false));
|
||||
}
|
||||
}
|
||||
catch
|
||||
|
|
Loading…
Reference in New Issue