Replace Ctrl+Alt+Enter with Esc

2 files changed, 13 insertions, 8 deletions

diff --git a/modules/ui_toprow.py b/modules/ui_toprow.py
index c3865e3d..9caf8faa 100644
--- a/modules/ui_toprow.py
+++ b/modules/ui_toprow.py
@@ -79,11 +79,11 @@ class Toprow:
     def create_prompts(self):

         with gr.Column(elem_id=f"{self.id_part}_prompt_container", elem_classes=["prompt-container-compact"] if self.is_compact else [], scale=6):

             with gr.Row(elem_id=f"{self.id_part}_prompt_row", elem_classes=["prompt-row"]):

-                self.prompt = gr.Textbox(label="Prompt", elem_id=f"{self.id_part}_prompt", show_label=False, lines=3, placeholder="Prompt\n(Press Ctrl+Enter to generate, Alt+Enter to skip, Ctrl+Alt+Enter to interrupt)", elem_classes=["prompt"])

+                self.prompt = gr.Textbox(label="Prompt", elem_id=f"{self.id_part}_prompt", show_label=False, lines=3, placeholder="Prompt\n(Press Ctrl+Enter to generate, Alt+Enter to skip, Esc to interrupt)", elem_classes=["prompt"])

                 self.prompt_img = gr.File(label="", elem_id=f"{self.id_part}_prompt_image", file_count="single", type="binary", visible=False)

 

             with gr.Row(elem_id=f"{self.id_part}_neg_prompt_row", elem_classes=["prompt-row"]):

-                self.negative_prompt = gr.Textbox(label="Negative prompt", elem_id=f"{self.id_part}_neg_prompt", show_label=False, lines=3, placeholder="Negative prompt\n(Press Ctrl+Enter to generate, Alt+Enter to skip, Ctrl+Alt+Enter to interrupt)", elem_classes=["prompt"])

+                self.negative_prompt = gr.Textbox(label="Negative prompt", elem_id=f"{self.id_part}_neg_prompt", show_label=False, lines=3, placeholder="Negative prompt\n(Press Ctrl+Enter to generate, Alt+Enter to skip, Esc to interrupt)", elem_classes=["prompt"])

 

         self.prompt_img.change(

             fn=modules.images.image_data,

diff --git a/script.js b/script.js
index 69598f45..44950090 100644
--- a/script.js
+++ b/script.js
@@ -124,18 +124,19 @@ document.addEventListener("DOMContentLoaded", function() {
  * Add keyboard shortcuts:
  * Ctrl+Enter to start/restart a generation
  * Alt/Option+Enter to skip a generation
- * Alt/Option+Ctrl+Enter to interrupt a generation
+ * Esc to interrupt a generation
  */
 document.addEventListener('keydown', function(e) {
     const isEnter = e.key === 'Enter' || e.keyCode === 13;
     const isCtrlKey = e.metaKey || e.ctrlKey;
     const isAltKey = e.altKey;
+    const isEsc = e.key === 'Escape';
 
     const generateButton = get_uiCurrentTabContent().querySelector('button[id$=_generate]');
     const interruptButton = get_uiCurrentTabContent().querySelector('button[id$=_interrupt]');
     const skipButton = get_uiCurrentTabContent().querySelector('button[id$=_skip]');
 
-    if (isCtrlKey && isEnter && !isAltKey) {
+    if (isCtrlKey && isEnter) {
         if (interruptButton.style.display === 'block') {
             interruptButton.click();
             const callback = (mutationList) => {
@@ -156,14 +157,18 @@ document.addEventListener('keydown', function(e) {
         e.preventDefault();
     }
 
-    if (isAltKey && isEnter && !isCtrlKey) {
+    if (isAltKey && isEnter) {
         skipButton.click();
         e.preventDefault();
     }
 
-    if (isAltKey && isCtrlKey && isEnter) {
-        interruptButton.click();
-        e.preventDefault();
+    if (isEsc) {
+        if (!globalPopup || globalPopup.style.display === "none") {
+            interruptButton.click();
+            e.preventDefault();
+        } else {
+            closePopup();
+        }
     }
 });