OPENGIT/stable-diffusion-webui
1
0
Fork 0
mirror of https://github.com/AUTOMATIC1111/stable-diffusion-webui.git synced 2025-04-13 16:29:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

prevent make alt key from opening main menu if it's used for brush size also

Browse Source
This commit is contained in:
AUTOMATIC1111 2024-03-16 18:44:36 +03:00
parent 2f9d1c33e2
commit 0283826179
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
extensions-builtin/canvas-zoom-and-pan/javascript/zoom.js
View File

@ -252,6 +252,7 @@ onUiLoaded(async() => {
let isMoving = false; let isMoving = false;
let mouseX, mouseY; let mouseX, mouseY;
let activeElement; let activeElement;
let interactedWithAltKey = false;
const elements = Object.fromEntries( const elements = Object.fromEntries(
Object.keys(elementIDs).map(id => [ Object.keys(elementIDs).map(id => [
@ -508,6 +509,10 @@ onUiLoaded(async() => {
if (isModifierKey(e, hotkeysConfig.canvas_hotkey_zoom)) { if (isModifierKey(e, hotkeysConfig.canvas_hotkey_zoom)) {
e.preventDefault(); e.preventDefault();
if(hotkeysConfig.canvas_hotkey_zoom === "Alt"){
interactedWithAltKey = true;
}
let zoomPosX, zoomPosY; let zoomPosX, zoomPosY;
let delta = 0.2; let delta = 0.2;
if (elemData[elemId].zoomLevel > 7) { if (elemData[elemId].zoomLevel > 7) {
@ -800,6 +805,10 @@ onUiLoaded(async() => {
if (isModifierKey(e, hotkeysConfig.canvas_hotkey_adjust)) { if (isModifierKey(e, hotkeysConfig.canvas_hotkey_adjust)) {
e.preventDefault(); e.preventDefault();
if(hotkeysConfig.canvas_hotkey_adjust === "Alt"){
interactedWithAltKey = true;
}
// Increase or decrease brush size based on scroll direction // Increase or decrease brush size based on scroll direction
adjustBrushSize(elemId, e.deltaY); adjustBrushSize(elemId, e.deltaY);
} }
@ -840,28 +849,16 @@ onUiLoaded(async() => {
document.addEventListener("keyup", handleMoveKeyUp); document.addEventListener("keyup", handleMoveKeyUp);
// Prevent firefox to open toolbar on pressing alt // Prevent firefox from opening main menu when alt is used as a hotkey for zoom or brush size
let wasAltPressed = false;
function handleAltKeyDown(e) {
if (!activeElement) return;
if (hotkeysConfig.canvas_hotkey_zoom !== "Alt") return;
if (e.key === "Alt") {
wasAltPressed = true;
} else {
wasAltPressed = false;
}
}
function handleAltKeyUp(e) { function handleAltKeyUp(e) {
if (hotkeysConfig.canvas_hotkey_zoom !== "Alt") return; if (e.key !== "Alt" || !interactedWithAltKey) {
if (wasAltPressed || (activeElement && e.key === "Alt")) { return;
e.preventDefault(); }
}
wasAltPressed = false; e.preventDefault();
interactedWithAltKey = false;
} }
document.addEventListener("keydown", handleAltKeyDown);
document.addEventListener("keyup", handleAltKeyUp); document.addEventListener("keyup", handleAltKeyUp);