OPENGIT/stable-diffusion-webui
1
0
Fork 0
mirror of https://github.com/AUTOMATIC1111/stable-diffusion-webui.git synced 2025-01-19 21:00:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Replace Ctrl+Alt+Enter with Esc

Browse Source
This commit is contained in:
kaalibro 2023-12-10 16:28:56 +06:00
parent 9c201550dd
commit 1d42babd32
No known key found for this signature in database
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/ui_toprow.py
View File

@ -79,11 +79,11 @@ class Toprow:
def create_prompts(self): 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.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"]): 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) 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"]): 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( self.prompt_img.change(
fn=modules.images.image_data, fn=modules.images.image_data,

17
script.js
View File

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