Merge pull request #2 from wththd/test_pr

Implemented closing modal window on esc (back) key

Author: siberder

Assets/ModalWindows/Scripts/ModalWindow.cs

@@ -92,6 +92,8 @@ public virtual T SetHeader(string text)
 
         return Instance;
     }
+    
+    
 
     public virtual T SetBody(string text)
     {
@@ -119,6 +121,23 @@ protected virtual void OnBeforeShow()
         }
     }
 
+    protected virtual void Update()
+    {
+        CheckIgnorableForClose();
+    }
+
+    protected virtual void CheckIgnorableForClose()
+    {
+        if (Input.GetKeyDown(KeyCode.Escape))
+        {
+            if (!ReferenceEquals(Instance, null))
+            {
+                if (Instance.ignorable)
+                    Instance.Close();
+            }
+        }
+    }
+
     public virtual T Show()
     {
         OnBeforeShow();

Assets/ModalWindows/Scripts/ModalWindows/InputModalWindow.cs

@@ -36,12 +36,11 @@ void SubmitInput()
         Close();
     }
 
-    private void Update()
+    protected override void Update()
     {
+        base.Update();
         if (inputField.isFocused && inputField.text != "" && Input.GetKeyUp(KeyCode.Return))
-        {
             SubmitInput();
-        }
     }
 
     public void UI_InputFieldOKButton()

Assets/ModalWindows/Scripts/ModalWindows/SimpleModalWindow.cs

@@ -1,4 +1,5 @@
-using System.Collections;
+using System;
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
@@ -8,4 +9,5 @@ public class SimpleModalWindow : ModalWindow<SimpleModalWindow>
     {
         return ModalWindow<SimpleModalWindow>.Create(ignorable);
     }
+
 }