make PNG info tab work properly with parameter overrides

2 files changed, 9 insertions, 8 deletions

diff --git a/modules/generation_parameters_copypaste.py b/modules/generation_parameters_copypaste.py
index fc9e17aa..89dc23bf 100644
--- a/modules/generation_parameters_copypaste.py
+++ b/modules/generation_parameters_copypaste.py
@@ -74,8 +74,8 @@ def image_from_url_text(filedata):
     return image

 

 

-def add_paste_fields(tabname, init_img, fields):

-    paste_fields[tabname] = {"init_img": init_img, "fields": fields}

+def add_paste_fields(tabname, init_img, fields, override_settings_component=None):

+    paste_fields[tabname] = {"init_img": init_img, "fields": fields, "override_settings_component": override_settings_component}

 

     # backwards compatibility for existing extensions

     import modules.ui

@@ -110,6 +110,7 @@ def connect_paste_params_buttons():
     for binding in registered_param_bindings:

         destination_image_component = paste_fields[binding.tabname]["init_img"]

         fields = paste_fields[binding.tabname]["fields"]

+        override_settings_component = binding.override_settings_component or paste_fields[binding.tabname]["override_settings_component"]

 

         destination_width_component = next(iter([field for field, name in fields if name == "Size-1"] if fields else []), None)

         destination_height_component = next(iter([field for field, name in fields if name == "Size-2"] if fields else []), None)

@@ -130,7 +131,7 @@ def connect_paste_params_buttons():
             )

 

         if binding.source_text_component is not None and fields is not None:

-            connect_paste(binding.paste_button, fields, binding.source_text_component, binding.override_settings_component, binding.tabname)

+            connect_paste(binding.paste_button, fields, binding.source_text_component, override_settings_component, binding.tabname)

 

         if binding.source_tabname is not None and fields is not None:

             paste_field_names = ['Prompt', 'Negative prompt', 'Steps', 'Face restoration'] + (["Seed"] if shared.opts.send_seed else [])

diff --git a/modules/ui.py b/modules/ui.py
index 54efb6a4..2fdbda42 100644
--- a/modules/ui.py
+++ b/modules/ui.py
@@ -631,9 +631,9 @@ def create_ui():
                 (hr_resize_y, "Hires resize-2"),

                 *modules.scripts.scripts_txt2img.infotext_fields

             ]

-            parameters_copypaste.add_paste_fields("txt2img", None, txt2img_paste_fields)

+            parameters_copypaste.add_paste_fields("txt2img", None, txt2img_paste_fields, override_settings)

             parameters_copypaste.register_paste_params_button(parameters_copypaste.ParamBinding(

-                paste_button=txt2img_paste, tabname="txt2img", source_text_component=txt2img_prompt, source_image_component=None, override_settings_component=override_settings,

+                paste_button=txt2img_paste, tabname="txt2img", source_text_component=txt2img_prompt, source_image_component=None,

             ))

 

             txt2img_preview_params = [

@@ -963,10 +963,10 @@ def create_ui():
                 (mask_blur, "Mask blur"),

                 *modules.scripts.scripts_img2img.infotext_fields

             ]

-            parameters_copypaste.add_paste_fields("img2img", init_img, img2img_paste_fields)

-            parameters_copypaste.add_paste_fields("inpaint", init_img_with_mask, img2img_paste_fields)

+            parameters_copypaste.add_paste_fields("img2img", init_img, img2img_paste_fields, override_settings)

+            parameters_copypaste.add_paste_fields("inpaint", init_img_with_mask, img2img_paste_fields, override_settings)

             parameters_copypaste.register_paste_params_button(parameters_copypaste.ParamBinding(

-                paste_button=img2img_paste, tabname="img2img", source_text_component=img2img_prompt, source_image_component=None, override_settings_component=override_settings,

+                paste_button=img2img_paste, tabname="img2img", source_text_component=img2img_prompt, source_image_component=None,

             ))

 

     modules.scripts.scripts_current = None