Unverified Commit 6b00d876 authored by AUTOMATIC1111's avatar AUTOMATIC1111 Committed by GitHub
Browse files

Merge pull request #7936 from EllangoK/master 

Custom height and width settings for Extra Networks cards
parents a03536f2 38335e1b

html/extra-networks-card.html

+1 −1
Original line number Diff line number Diff line 
<div class='card' {preview_html} onclick={card_clicked}>

<div class='card' style={style} onclick={card_clicked}>

	{metadata_button}



	<div class='actions'>

modules/shared.py

+2 −0
Original line number Diff line number Diff line
@@ -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),

}))

modules/ui_extra_networks.py

+4 −1
Original line number Diff line number Diff line
@@ -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"]),

CRA Git | Maintained and supported by SUSTech CRA and CCSE