Make the ctrl+enter shortcut use the generate button on the current tab

This commit is contained in:
Jairo Correa 2022-10-11 02:22:46 -03:00 committed by AUTOMATIC1111
parent 42bf5fa325
commit 8b7d3f1bef
2 changed files with 10 additions and 3 deletions

View file

@ -1331,7 +1331,7 @@ Requested path was: {f}
with gr.Tabs() as tabs: with gr.Tabs() as tabs:
for interface, label, ifid in interfaces: for interface, label, ifid in interfaces:
with gr.TabItem(label, id=ifid): with gr.TabItem(label, id=ifid, elem_id='tab_' + ifid):
interface.render() interface.render()
if os.path.exists(os.path.join(script_path, "notification.mp3")): if os.path.exists(os.path.join(script_path, "notification.mp3")):

View file

@ -6,6 +6,10 @@ function get_uiCurrentTab() {
return gradioApp().querySelector('.tabs button:not(.border-transparent)') return gradioApp().querySelector('.tabs button:not(.border-transparent)')
} }
function get_uiCurrentTabContent() {
return gradioApp().querySelector('.tabitem[id^=tab_]:not([style*="display: none"])')
}
uiUpdateCallbacks = [] uiUpdateCallbacks = []
uiTabChangeCallbacks = [] uiTabChangeCallbacks = []
let uiCurrentTab = null let uiCurrentTab = null
@ -51,7 +55,10 @@ document.addEventListener("DOMContentLoaded", function() {
if((e.keyCode == 13 && (e.metaKey || e.ctrlKey))) handled = true; if((e.keyCode == 13 && (e.metaKey || e.ctrlKey))) handled = true;
} }
if (handled) { if (handled) {
gradioApp().querySelector("#txt2img_generate").click(); button = get_uiCurrentTabContent().querySelector('button[id$=_generate]');
if (button) {
button.click();
}
e.preventDefault(); e.preventDefault();
} }
}) })