Add Escape shortcut to close Build Window

chikega · Dec 17, 2019 · 733ca65 · 733ca65
1 parent 01b6174
commit 733ca65
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/PureBasicIDE/CompilerWindow.pb b/PureBasicIDE/CompilerWindow.pb
@@ -489,6 +489,13 @@ EndProcedure
 Procedure BuildWindowEvents(EventID)
   Quit = 0
 
+  If EventID = #PB_Event_Menu     ; Little wrapper to map the shortcut events (identified as menu)
+    EventID  = #PB_Event_Gadget   ; to normal gadget events...
+    GadgetID = EventMenu()
+  Else
+    GadgetID = EventGadget()
+  EndIf
+
   If EventID = #PB_Event_Gadget
     Select EventGadget()
       Case #GADGET_Build_Targets
@@ -558,7 +565,11 @@ Procedure BuildWindowEvents(EventID)
         ForEver
 
       Case #GADGET_Build_Close
-        Quit = 1
+        ; CompilerBusy goes to 0 after each target
+        ; UseProjectBuildWindow goes to 0 when all are done
+        If (Not CompilerBusy) And (Not UseProjectBuildWindow)
+          Quit = 1
+        EndIf
 
     EndSelect
 

diff --git a/PureBasicIDE/dialogs/Build.xml b/PureBasicIDE/dialogs/Build.xml
@@ -40,4 +40,6 @@
     </multibox>
 
   </vbox>
+
+  <shortcut key="#PB_Shortcut_Escape" id="#GADGET_Build_Close" />
 </window>