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

apply brush size limit early

Browse Source
This commit is contained in:
w-e-w 2024-11-22 11:29:44 +09:00
parent 7cf80a70d9
commit 1b9dea7d90
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -470,11 +470,18 @@ onUiLoaded(async() => {
gradioApp().querySelector( gradioApp().querySelector(
`${elemId} button[aria-label="Use brush"]` `${elemId} button[aria-label="Use brush"]`
); );
if (input) { if (input) {
input.click(); input.click();
if (!withoutValue) { if (!withoutValue) {
const maxValue = parseFloat(input.getAttribute("max")) || 100; const maxValue = parseFloat(input.getAttribute("max")) || 100;
// allow brush size up to 1/2 diagonal of the image, beyond gradio's arbitrary limit
const canvasImg = gradioApp().querySelector(`${elemId} img`);
if (canvasImg) {
const maxDiameter = Math.sqrt(canvasImg.naturalWidth ** 2 + canvasImg.naturalHeight ** 2) / 2;
if (maxDiameter > maxValue) {
input.setAttribute("max", maxDiameter);
}
}
const brush_factor = deltaY > 0 ? 1 - opts.canvas_hotkey_brush_factor : 1 + opts.canvas_hotkey_brush_factor; const brush_factor = deltaY > 0 ? 1 - opts.canvas_hotkey_brush_factor : 1 + opts.canvas_hotkey_brush_factor;
const currentRadius = parseFloat(input.value); const currentRadius = parseFloat(input.value);
let delta = Math.sqrt(currentRadius ** 2 * brush_factor) - currentRadius; let delta = Math.sqrt(currentRadius ** 2 * brush_factor) - currentRadius;
@ -483,16 +490,6 @@ onUiLoaded(async() => {
delta = deltaY > 0 ? -1 : 1; delta = deltaY > 0 ? -1 : 1;
} }
const newValue = currentRadius + delta; const newValue = currentRadius + delta;
// allow increasing the brush size beyond what's limited by gradio up to 1/2 diagonal of the image
if (newValue > maxValue) {
const canvasImg = gradioApp().querySelector(`${elemId} img`);
if (canvasImg) {
const maxDiameter = Math.sqrt(canvasImg.naturalWidth ** 2 + canvasImg.naturalHeight ** 2) / 2;
if (newValue < maxDiameter) {
input.setAttribute("max", newValue);
}
}
}
input.value = Math.max(newValue, 1); input.value = Math.max(newValue, 1);
input.dispatchEvent(new Event("change")); input.dispatchEvent(new Event("change"));
} }