Changes naming of numlock and capslock states and transitions

Author: guFalcon

InputStateManager/Inputs/Key.cs

@@ -117,15 +117,15 @@ public bool Release(params Keys[] keys)
             public bool CtrlPress => OnePress(Keys.LeftControl, Keys.RightControl);
             public bool AltPress => OnePress(Keys.LeftAlt, Keys.RightAlt);
             public bool WindowsPress => OnePress(Keys.LeftWindows, Keys.RightWindows);
-            public bool NumLockStatePress => State().NumLock && !OldState().NumLock;
-            public bool CapsLockStatePress => State().CapsLock && !OldState().CapsLock;
+            public bool NumLockStateEnter => State().NumLock && !OldState().NumLock;
+            public bool CapsLockStateEnter => State().CapsLock && !OldState().CapsLock;
 
             public bool ShiftRelease => Release(Keys.LeftShift, Keys.RightShift);
             public bool CtrlRelease => Release(Keys.LeftControl, Keys.RightControl);
             public bool AltRelease => Release(Keys.LeftAlt, Keys.RightAlt);
             public bool WindowsRelease => Release(Keys.LeftWindows, Keys.RightWindows);
-            public bool NumLockStateRelease => !State().NumLock && OldState().NumLock;
-            public bool CapsLockStateRelease => !State().CapsLock && OldState().CapsLock;
+            public bool NumLockStateExit => !State().NumLock && OldState().NumLock;
+            public bool CapsLockStateExit => !State().CapsLock && OldState().CapsLock;
         }
 
         [PublicAPI]

NUnitTests/KeyTests.cs

@@ -351,14 +351,14 @@ public void CapslockPressIsTriggeredAndReleased()
                 .Returns(new KeyboardState(new Keys[] { }, true))
                 .Returns(new KeyboardState());
             input.Update();
-            Assert.IsTrue(input.Key.Is.CapsLockStatePress);
+            Assert.IsTrue(input.Key.Is.CapsLockStateEnter);
             Assert.IsTrue(input.Key.Is.CapsLockStateOn);
             input.Update();
-            Assert.IsFalse(input.Key.Is.CapsLockStatePress);
+            Assert.IsFalse(input.Key.Is.CapsLockStateEnter);
             Assert.IsTrue(input.Key.Is.CapsLockStateOn);
             input.Update();
-            Assert.IsFalse(input.Key.Is.CapsLockStatePress);
-            Assert.IsTrue(input.Key.Is.CapsLockStateRelease);
+            Assert.IsFalse(input.Key.Is.CapsLockStateEnter);
+            Assert.IsTrue(input.Key.Is.CapsLockStateExit);
             Assert.IsTrue(input.Key.Is.CapsLockStateOff);
         }
 
@@ -370,14 +370,14 @@ public void NumlockPressIsTriggeredAndReleased()
                 .Returns(new KeyboardState(new Keys[] { }, false, true))
                 .Returns(new KeyboardState());
             input.Update();
-            Assert.IsTrue(input.Key.Is.NumLockStatePress);
+            Assert.IsTrue(input.Key.Is.NumLockStateEnter);
             Assert.IsTrue(input.Key.Is.NumLockStateOn);
             input.Update();
-            Assert.IsFalse(input.Key.Is.NumLockStatePress);
+            Assert.IsFalse(input.Key.Is.NumLockStateEnter);
             Assert.IsTrue(input.Key.Is.NumLockStateOn);
             input.Update();
-            Assert.IsFalse(input.Key.Is.NumLockStatePress);
-            Assert.IsTrue(input.Key.Is.NumLockStateRelease);
+            Assert.IsFalse(input.Key.Is.NumLockStateEnter);
+            Assert.IsTrue(input.Key.Is.NumLockStateExit);
             Assert.IsTrue(input.Key.Is.NumLockStateOff);
         }
 

README.md

@@ -110,8 +110,12 @@ if (input.Key.Is.OnePress(new []{Keys.A, Keys.B})) {...}
 if (input.Key.Is.Down(Keys.A) && input.Key.Is.ShiftDown) {...}
 // Same for CTRL and ALT:
 if (input.Key.Is.CtrlRelease() || input.Key.Is.AltPress()) {...}
-// And NumLock and CapsLock:
-if (input.Key.Is.NumLockRelease() || input.Key.Is.CapsLockPress()) {..}
+// And NumLock- and CapsLock-states:
+if (input.Key.Is.NumLockOn() && input.Key.Is.CapsLockOff()) {..}
+// And the transitions of those states:
+if (input.Key.Is.NumLockStateExit() || input.Key.Is.CapsLockStateEnter()) {..}
+// Or their respective key-presses or up-down values:
+if (input.Key.Is.Down(Keys.NumLock) || input.Key.Is.Release(Keys.CapsLock))
 ...
 
 

Test/Game1.cs

@@ -125,10 +125,10 @@ private void DrawText()
             b.Append($"Keys NumLock Down: {input.Key.Is.Down(Keys.NumLock)} " +
                      $"Pressed: {input.Key.Is.Press(Keys.NumLock)} " +
                      $"Released: {input.Key.Is.Release(Keys.NumLock)}\n");
-            b.Append($"bool NumLock on: {input.Key.Is.NumLockStateOn} / {input.Key.Is.NumLockStatePress}\n");
-            b.Append($"bool NumLock off: {input.Key.Is.NumLockStateOff} / {input.Key.Is.NumLockStateRelease}\n");
-            b.Append($"bool CapsLock on: {input.Key.Is.CapsLockStateOn} / {input.Key.Is.CapsLockStatePress}\n");
-            b.Append($"bool CapsLock off: {input.Key.Is.CapsLockStateOff} / {input.Key.Is.CapsLockStateRelease}\n");
+            b.Append($"bool NumLock on: {input.Key.Is.NumLockStateOn} / {input.Key.Is.NumLockStateEnter}\n");
+            b.Append($"bool NumLock off: {input.Key.Is.NumLockStateOff} / {input.Key.Is.NumLockStateExit}\n");
+            b.Append($"bool CapsLock on: {input.Key.Is.CapsLockStateOn} / {input.Key.Is.CapsLockStateEnter}\n");
+            b.Append($"bool CapsLock off: {input.Key.Is.CapsLockStateOff} / {input.Key.Is.CapsLockStateExit}\n");
 
             spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.AlphaBlend);
             spriteBatch.DrawString(font, b, new Vector2(10, 10), Color.White);