Merge branch 'master' into varsize

1 files changed, 14 insertions, 9 deletions

diff --git a/modules/ui.py b/modules/ui.py
index 4e709a71..9d6b141e 100644
--- a/modules/ui.py
+++ b/modules/ui.py
@@ -267,7 +267,7 @@ def calc_resolution_hires(enable, width, height, hr_scale, hr_resize_x, hr_resiz
     with devices.autocast():

         p.init([""], [0], [0])

 

-    return f"resize: from <span class='resolution'>{width}x{height}</span> to <span class='resolution'>{p.hr_upscale_to_x}x{p.hr_upscale_to_y}</span>"

+    return f"resize: from <span class='resolution'>{p.width}x{p.height}</span> to <span class='resolution'>{p.hr_resize_x or p.hr_upscale_to_x}x{p.hr_resize_y or p.hr_upscale_to_y}</span>"

 

 

 def apply_styles(prompt, prompt_neg, style1_name, style2_name):

@@ -745,15 +745,20 @@ def create_ui():
                             custom_inputs = modules.scripts.scripts_txt2img.setup_ui()

 

             hr_resolution_preview_inputs = [enable_hr, width, height, hr_scale, hr_resize_x, hr_resize_y]

-            hr_resolution_preview_args = dict(

-                fn=calc_resolution_hires,

-                inputs=hr_resolution_preview_inputs,

-                outputs=[hr_final_resolution],

-                show_progress=False

-            )

-

             for input in hr_resolution_preview_inputs:

-                input.change(**hr_resolution_preview_args)

+                input.change(

+                    fn=calc_resolution_hires,

+                    inputs=hr_resolution_preview_inputs,

+                    outputs=[hr_final_resolution],

+                    show_progress=False,

+                )

+                input.change(

+                    None,

+                    _js="onCalcResolutionHires",

+                    inputs=hr_resolution_preview_inputs,

+                    outputs=[],

+                    show_progress=False,

+                )

 

             txt2img_gallery, generation_info, html_info, html_log = create_output_panel("txt2img", opts.outdir_txt2img_samples)

             parameters_copypaste.bind_buttons({"txt2img": txt2img_paste}, None, txt2img_prompt)