added deactivating text (and selectbox) gadgets with "Escape" key

[rocksndiamonds.git] / src / libgame / gadgets.c

diff --git a/src/libgame/gadgets.c b/src/libgame/gadgets.c
index 4b237b88d416c0e096581b0abb4d280dd4927e69..0295eec69a48d1b4cabfb4d08c44fe76bc4d1519 100644 (file)
--- a/src/libgame/gadgets.c
+++ b/src/libgame/gadgets.c
@@ -2117,7 +2117,18 @@ boolean HandleGadgetsKeyInput(Key key)
 
   if (key == KSYM_Escape)
   {
-    StopTextInput();
+    if (anyTextGadgetActive())
+    {
+      // restore previous text (before activating text gadget)
+      if (gi->type & GD_TYPE_TEXT_INPUT)
+       strcpy(gi->textinput.value, gi->textinput.last_value);
+
+      DrawGadget(gi, DG_UNPRESSED, gi->direct_draw);
+
+      last_gi = NULL;
+
+      StopTextInput();
+    }
   }
   else if (key == KSYM_Return) // valid for both text input and selectbox
   {