diff options
| author | AUTOMATIC1111 <16777216c@gmail.com> | 2023-03-25 10:01:49 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-25 10:01:49 +0000 |
| commit | 6b00d876f723cc7cb202afa2d31a791901d38295 (patch) | |
| tree | c8d63d4e11fde6256a48bf72950d002094b670d9 | |
| parent | a03536f21333099799177914003a6fe2948a9377 (diff) | |
| parent | 38335e1b8fe30ee555a6ddd542898b7db4fce9b1 (diff) | |
| download | stable-diffusion-webui-gfx803-6b00d876f723cc7cb202afa2d31a791901d38295.tar.gz stable-diffusion-webui-gfx803-6b00d876f723cc7cb202afa2d31a791901d38295.tar.bz2 stable-diffusion-webui-gfx803-6b00d876f723cc7cb202afa2d31a791901d38295.zip | |
Merge pull request #7936 from EllangoK/master
Custom height and width settings for Extra Networks cards
| -rw-r--r-- | html/extra-networks-card.html | 2 | ||||
| -rw-r--r-- | modules/shared.py | 2 | ||||
| -rw-r--r-- | modules/ui_extra_networks.py | 5 |
3 files changed, 7 insertions, 2 deletions
diff --git a/html/extra-networks-card.html b/html/extra-networks-card.html index 1bf3fc30..ef4b613a 100644 --- a/html/extra-networks-card.html +++ b/html/extra-networks-card.html @@ -1,4 +1,4 @@ -<div class='card' {preview_html} onclick={card_clicked}> +<div class='card' style={style} onclick={card_clicked}> {metadata_button} <div class='actions'> diff --git a/modules/shared.py b/modules/shared.py index e2ca12c1..73ce77d4 100644 --- a/modules/shared.py +++ b/modules/shared.py @@ -451,6 +451,8 @@ options_templates.update(options_section(('interrogate', "Interrogate Options"), options_templates.update(options_section(('extra_networks', "Extra Networks"), {
"extra_networks_default_view": OptionInfo("cards", "Default view for Extra Networks", gr.Dropdown, {"choices": ["cards", "thumbs"]}),
"extra_networks_default_multiplier": OptionInfo(1.0, "Multiplier for extra networks", gr.Slider, {"minimum": 0.0, "maximum": 1.0, "step": 0.01}),
+ "extra_networks_card_width": OptionInfo(0, "Card width for Extra Networks (px)"),
+ "extra_networks_card_height": OptionInfo(0, "Card height for Extra Networks (px)"),
"extra_networks_add_text_separator": OptionInfo(" ", "Extra text to add before <...> when adding extra network to prompt"),
"sd_hypernetwork": OptionInfo("None", "Add hypernetwork to prompt", gr.Dropdown, lambda: {"choices": [""] + [x for x in hypernetworks.keys()]}, refresh=reload_hypernetworks),
}))
diff --git a/modules/ui_extra_networks.py b/modules/ui_extra_networks.py index 8418147b..daea03d6 100644 --- a/modules/ui_extra_networks.py +++ b/modules/ui_extra_networks.py @@ -147,13 +147,16 @@ class ExtraNetworksPage: if onclick is None:
onclick = '"' + html.escape(f"""return cardClicked({json.dumps(tabname)}, {item["prompt"]}, {"true" if self.allow_negative_prompt else "false"})""") + '"'
+ height = f"height: {shared.opts.extra_networks_card_height}px;" if shared.opts.extra_networks_card_height else ''
+ width = f"width: {shared.opts.extra_networks_card_width}px;" if shared.opts.extra_networks_card_width else ''
+ background_image = f"background-image: url(\"{html.escape(preview)}\");" if preview else ''
metadata_button = ""
metadata = item.get("metadata")
if metadata:
metadata_button = f"<div class='metadata-button' title='Show metadata' onclick='extraNetworksRequestMetadata(event, {json.dumps(self.name)}, {json.dumps(item['name'])})'></div>"
args = {
- "preview_html": "style='background-image: url(\"" + html.escape(preview) + "\")'" if preview else '',
+ "style": f"'{height}{width}{background_image}'",
"prompt": item.get("prompt", None),
"tabname": json.dumps(tabname),
"local_preview": json.dumps(item["local_preview"]),
|