Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
S
Stable Diffusion Webui
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
novelai-storage
Stable Diffusion Webui
Commits
02838261
Commit
02838261
authored
Mar 16, 2024
by
AUTOMATIC1111
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
prevent make alt key from opening main menu if it's used for brush size also
parent
2f9d1c33
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
18 deletions
+15
-18
extensions-builtin/canvas-zoom-and-pan/javascript/zoom.js
extensions-builtin/canvas-zoom-and-pan/javascript/zoom.js
+15
-18
No files found.
extensions-builtin/canvas-zoom-and-pan/javascript/zoom.js
View file @
02838261
...
@@ -252,6 +252,7 @@ onUiLoaded(async() => {
...
@@ -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() => {
...
@@ -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() => {
...
@@ -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() => {
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment