Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add keyboard shortcuts for generate/skip/interrupt #14269

Merged

Conversation

kaalibro
Copy link
Contributor

@kaalibro kaalibro commented Dec 9, 2023

Description

A small addition to #13644

Ctrl+Enter to start/restart a generation
add: Alt+Enter to skip
add: Esc to interrupt (if there is a popup or lightbox, closes it first)

Screenshots/videos:

skip-interrupt-keyb-shortcuts.mp4

Checklist:

(Removed Alt+Enter) Ctrl+Enter to start/restart generation
(New) Alt/Option+Enter to skip generation
(New) Ctrl+Alt/Option+Enter to interrupt generation
@missionfloyd
Copy link
Collaborator

I think escape would make more sense.

@kaalibro
Copy link
Contributor Author

Perhaps, yes. But it's necessary to check that Esc to close popup 01c8f18 does not interfere with Esc during generation. For example, if I want to edit the styles while the generation is in progress :)

I'll supplement the commit a little later.

script.js Outdated
Comment on lines 170 to 172
} else {
if (!globalPopup) return;
globalPopup.style.display = "none";
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This else isn't necessary, the existing handler is still gonna fire.

Esc is also used to close the full screen image viewer.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the tip! Made the edits.

@AUTOMATIC1111 AUTOMATIC1111 merged commit 96c393a into AUTOMATIC1111:dev Dec 14, 2023
3 checks passed
@kaalibro kaalibro deleted the skip-interrupt-keyb-shortcuts branch January 4, 2024 07:11
@w-e-w w-e-w mentioned this pull request Feb 17, 2024
@pawel665j pawel665j mentioned this pull request Apr 16, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants