StardewValley
/
SMAPI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "suppress keyboard events when a textbox is focused (#445)" 

This reverts commit 0330150666.
This commit is contained in:
Jesse Plamondon-Willard 2018-02-22 20:58:31 -05:00
parent ddba317142
commit dae5838696
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/release-notes.md
View File

@ -15,7 +15,6 @@
* Fixed deadlock in rare cases when injecting a file with an asset loader.
* Fixed unhelpful error when a mod exposes a non-public API.
* Fixed unhelpful error when a translation file has duplicate keys due to case-insensitivity.
* Fixed input events being raised for keyboard buttons when a textbox is receiving input.
* Fixed some JSON field names being case-sensitive.
* Fixed `helper.ReadJsonFile` and `helper.WriteJsonFile` not normalising path separators.

22
src/SMAPI/Framework/SGame.cs
View File

@ -258,7 +258,7 @@ namespace StardewModdingAPI.Framework
this.Monitor.Log("Context: before save creation.", LogLevel.Trace);
SaveEvents.InvokeBeforeCreate(this.Monitor);
}
// raise before-save
if (Context.IsWorldReady && !this.IsBetweenSaveEvents)
{
@ -387,23 +387,20 @@ namespace StardewModdingAPI.Framework
}
// raise input events
bool isTextboxReceiving = Game1.keyboardDispatcher?.Subscriber?.Selected == true;
foreach (var pair in inputState.ActiveButtons)
{
SButton button = pair.Key;
InputStatus status = pair.Value;
bool isKeyboard = button.TryGetKeyboard(out Keys keyboardKey);
if (status == InputStatus.Pressed)
{
if (!isTextboxReceiving || !isKeyboard)
InputEvents.InvokeButtonPressed(this.Monitor, button, cursor, button.IsActionButton(), button.IsUseToolButton());
InputEvents.InvokeButtonPressed(this.Monitor, button, cursor, button.IsActionButton(), button.IsUseToolButton());
// legacy events
if (isKeyboard)
if (button.TryGetKeyboard(out Keys key))
{
if (!isTextboxReceiving && keyboardKey != Keys.None)
ControlEvents.InvokeKeyPressed(this.Monitor, keyboardKey);
if (key != Keys.None)
ControlEvents.InvokeKeyPressed(this.Monitor, key);
}
else if (button.TryGetController(out Buttons controllerButton))
{
@ -415,14 +412,13 @@ namespace StardewModdingAPI.Framework
}
else if (status == InputStatus.Released)
{
if (!isTextboxReceiving || !isKeyboard)
InputEvents.InvokeButtonReleased(this.Monitor, button, cursor, button.IsActionButton(), button.IsUseToolButton());
InputEvents.InvokeButtonReleased(this.Monitor, button, cursor, button.IsActionButton(), button.IsUseToolButton());
// legacy events
if (isKeyboard)
if (button.TryGetKeyboard(out Keys key))
{
if (!isTextboxReceiving && keyboardKey != Keys.None)
ControlEvents.InvokeKeyReleased(this.Monitor, keyboardKey);
if (key != Keys.None)
ControlEvents.InvokeKeyReleased(this.Monitor, key);
}
else if (button.TryGetController(out Buttons controllerButton))
{