~/Projects/stable-diffusion-webui
git clone https://code.lsong.org/stable-diffusion-webui
Commit
- Commit
- 63cac3c3ccdf0685aa010d955c5fd62d1c30306d
- Author
- AUTOMATIC1111 <[email protected]>
- Date
- 2023-08-05 07:34:22 +0300 +0300
- Diffstat
modules/shared.py | 3 +++ modules/ui.py | 7 +++----
Merge pull request #12326 from AUTOMATIC1111/configurable-masks-color-and-default-brush-color- configurable masks color and default brush color
diff --git a/modules/shared.py b/modules/shared.py index cec030f7385aee0dd147b09c2877e30750bb1bad..1eb00b8fa364cdbda20907a5b280d9d0de582aad 100644 --- a/modules/shared.py +++ b/modules/shared.py @@ -492,6 +492,9 @@ options_templates.update(options_section(('ui', "User interface"), { "localization": OptionInfo("None", "Localization", gr.Dropdown, lambda: {"choices": ["None"] + list(localization.localizations.keys())}, refresh=lambda: localization.list_localizations(cmd_opts.localizations_dir)).needs_restart(), "gradio_theme": OptionInfo("Default", "Gradio theme", ui_components.DropdownEditable, lambda: {"choices": ["Default"] + gradio_hf_hub_themes}).needs_restart(), "img2img_editor_height": OptionInfo(720, "img2img: height of image editor", gr.Slider, {"minimum": 80, "maximum": 1600, "step": 1}).info("in pixels").needs_restart(), + "img2img_sketch_default_brush_color": OptionInfo("#000000", "sketch brush color", ui_components.FormColorPicker, {}).info("default brush color of img2img sketch) (requires reload"), + "img2img_inpaint_mask_brush_color": OptionInfo("#000000", "inpaint mask brush color", ui_components.FormColorPicker, {}).info("brush color of inpaint mask) (requires reload"), + "img2img_inpaint_sketch_default_brush_color": OptionInfo("#000000", "inpaint sketch brush color", ui_components.FormColorPicker, {}).info("default brush color of img2img inpaint sketch) (requires reload"), "return_grid": OptionInfo(True, "Show grid in results for web"), "return_mask": OptionInfo(False, "For inpainting, include the greyscale mask in results for web"), "return_mask_composite": OptionInfo(False, "For inpainting, include masked composite in results for web"), diff --git a/modules/ui.py b/modules/ui.py index 6cf3dff8880522f1b40f3066dfbb88f678a397a2..843a75ef87b130a4dbf45ebd4b165374e731c8d4 100644 --- a/modules/ui.py +++ b/modules/ui.py @@ -663,19 +663,18 @@ init_img = gr.Image(label="Image for img2img", elem_id="img2img_image", show_label=False, source="upload", interactive=True, type="pil", tool="editor", image_mode="RGBA", height=opts.img2img_editor_height) add_copy_image_controls('img2img', init_img) with gr.TabItem('Sketch', id='img2img_sketch', elem_id="img2img_img2img_sketch_tab") as tab_sketch: + if ii_output_dir != "": import os -def process_interrogate(interrogation_function, mode, ii_input_dir, ii_output_dir, *ii_singles): add_copy_image_controls('sketch', sketch) with gr.TabItem('Inpaint', id='inpaint', elem_id="img2img_inpaint_tab") as tab_inpaint: - ) import gradio as gr +random_symbol = '\U0001f3b2\ufe0f' # 🎲️ add_copy_image_controls('inpaint', init_img_with_mask) with gr.TabItem('Inpaint sketch', id='inpaint_sketch', elem_id="img2img_inpaint_sketch_tab") as tab_inpaint_color: -import os import gradio as gr -import json +reuse_symbol = '\u267b\ufe0f' # ♻️ inpaint_color_sketch_orig = gr.State(None) add_copy_image_controls('inpaint_sketch', inpaint_color_sketch)