A couple PR tweaks

lemosdeveloper · Jun 16, 2017 · 8ba2cc3 · 8ba2cc3
1 parent 5fc049f
commit 8ba2cc3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/Script/AtomicEditor/ui/Shortcuts.ts b/Script/AtomicEditor/ui/Shortcuts.ts
@@ -206,6 +206,13 @@ class Shortcuts extends Atomic.ScriptObject {
 
             if (!Atomic.ui.focusedWidget && !this.cmdKeyDown()) {
 
+                if (ev.key == Atomic.KEY_ESCAPE) {
+
+                    if (Atomic.ui.consoleIsVisible) {
+                        Atomic.ui.showConsole(false);
+                    }
+                }
+
                 if (ev.key == Atomic.KEY_W) {
                     this.invokeGizmoEditModeChanged(Editor.EditMode.EDIT_MOVE);
                 } else if (ev.key == Atomic.KEY_E) {

diff --git a/Source/Atomic/Resource/Image.cpp b/Source/Atomic/Resource/Image.cpp
@@ -38,11 +38,12 @@
 #include <libsquish/squish.h>
 #endif
 
-// ATOMIC END
-
 #include <STB/stb_image.h>
 #include <STB/stb_image_write.h>
 
+// ATOMIC END
+
+
 #include "../DebugNew.h"
 
 #ifndef MAKEFOURCC

diff --git a/Source/Atomic/UI/UI.h b/Source/Atomic/UI/UI.h
@@ -109,6 +109,9 @@ class ATOMIC_API UI : public Object, private tb::TBWidgetListener
     void ShowConsole(bool value);
     void ToggleConsole();
 
+    /// Get whether the console is currently visible
+    bool GetConsoleIsVisible() const { return consoleVisible_; }
+
     bool GetFocusedWidget();
 
     /// request exit on next frame