1580158
/
sd-webui-controlnet
mirror of https://github.com/Mikubill/sd-webui-controlnet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix zoom and mask brush color customizable (#1970) 

* make mask brush color customizable

* make zoom work with single CN module

* webui < 1.6 compatibility

* explicitly checks for applyZoomAndPan

* Update canvas.js

* Update canvas.js

---------

Co-authored-by: lllyasviel <lyuminzhang@outlook.com>
pull/1973/head
w-e-w 2023-08-25 06:37:59 +09:00 committed by GitHub
parent de868abdf2
commit b875b847a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
javascript/canvas.js
View File

@ -4,8 +4,10 @@
if (!hasApplied) {
if (typeof window.applyZoomAndPanIntegration === "function") {
hasApplied = true;
window.applyZoomAndPanIntegration("#txt2img_controlnet",Array.from({ length: 20 }, (_, i) => `#txt2img_controlnet_ControlNet-${i}_input_image`));
window.applyZoomAndPanIntegration("#img2img_controlnet",Array.from({ length: 20 }, (_, i) => `#img2img_controlnet_ControlNet-${i}_input_image`));
window.applyZoomAndPanIntegration("#txt2img_controlnet", Array.from({ length: 20 }, (_, i) => `#txt2img_controlnet_ControlNet-${i}_input_image`));
window.applyZoomAndPanIntegration("#img2img_controlnet", Array.from({ length: 20 }, (_, i) => `#img2img_controlnet_ControlNet-${i}_input_image`));
window.applyZoomAndPanIntegration("#txt2img_controlnet", ["#txt2img_controlnet_ControlNet_input_image"]);
window.applyZoomAndPanIntegration("#img2img_controlnet", ["#img2img_controlnet_ControlNet_input_image"]);
//console.log("window.applyZoomAndPanIntegration applied.");
} else {
//console.log("window.applyZoomAndPanIntegration is not available.");

1
scripts/controlnet_ui/controlnet_ui_group.py
View File

@ -175,6 +175,7 @@ class ControlNetUiGroup(object):
tool="sketch",
elem_id=f"{elem_id_tabname}_{tabname}_input_image",
elem_classes=["cnet-image"],
brush_color=shared.opts.img2img_inpaint_mask_brush_color if hasattr(shared.opts, 'img2img_inpaint_mask_brush_color') else None
)
with gr.Group(
visible=False, elem_classes=["cnet-generated-image-group"]