diff options
| author | AUTOMATIC1111 <16777216c@gmail.com> | 2023-12-16 07:05:10 +0000 |
|---|---|---|
| committer | AUTOMATIC1111 <16777216c@gmail.com> | 2023-12-16 07:05:10 +0000 |
| commit | e9c6325fc635302e2b4b8295345833cb8b15f7fb (patch) | |
| tree | b501070bcf1ae667b1555e682598973818c945e0 /modules/ui_extra_networks.py | |
| parent | 29f04149b60bcf6e8e2b41a161d6cc7e8981710f (diff) | |
| parent | 7504f14503d6ce5a014f1c558ea4f4d57675e1e9 (diff) | |
| download | stable-diffusion-webui-gfx803-e9c6325fc635302e2b4b8295345833cb8b15f7fb.tar.gz stable-diffusion-webui-gfx803-e9c6325fc635302e2b4b8295345833cb8b15f7fb.tar.bz2 stable-diffusion-webui-gfx803-e9c6325fc635302e2b4b8295345833cb8b15f7fb.zip | |
Merge branch 'dev' into torch210
Diffstat (limited to 'modules/ui_extra_networks.py')
| -rw-r--r-- | modules/ui_extra_networks.py | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/modules/ui_extra_networks.py b/modules/ui_extra_networks.py index f03e2033..fe5d3ba3 100644 --- a/modules/ui_extra_networks.py +++ b/modules/ui_extra_networks.py @@ -151,8 +151,13 @@ class ExtraNetworksPage: continue
subdir = os.path.abspath(x)[len(parentdir):].replace("\\", "/")
- while subdir.startswith("/"):
- subdir = subdir[1:]
+
+ if shared.opts.extra_networks_dir_button_function:
+ if not subdir.startswith("/"):
+ subdir = "/" + subdir
+ else:
+ while subdir.startswith("/"):
+ subdir = subdir[1:]
is_empty = len(os.listdir(x)) == 0
if not is_empty and not subdir.endswith("/"):
@@ -370,6 +375,9 @@ def create_ui(interface: gr.Blocks, unrelated_tabs, tabname): for page in ui.stored_extra_pages:
with gr.Tab(page.title, elem_id=f"{tabname}_{page.id_page}", elem_classes=["extra-page"]) as tab:
+ with gr.Column(elem_id=f"{tabname}_{page.id_page}_prompts", elem_classes=["extra-page-prompts"]):
+ pass
+
elem_id = f"{tabname}_{page.id_page}_cards_html"
page_elem = gr.HTML('Loading...', elem_id=elem_id)
ui.pages.append(page_elem)
@@ -400,7 +408,7 @@ def create_ui(interface: gr.Blocks, unrelated_tabs, tabname): allow_prompt = "true" if page.allow_prompt else "false"
allow_negative_prompt = "true" if page.allow_negative_prompt else "false"
- jscode = 'extraNetworksTabSelected("' + tabname + '", "' + f"{tabname}_{page.id_page}" + '", ' + allow_prompt + ', ' + allow_negative_prompt + ');'
+ jscode = 'extraNetworksTabSelected("' + tabname + '", "' + f"{tabname}_{page.id_page}_prompts" + '", ' + allow_prompt + ', ' + allow_negative_prompt + ');'
tab.select(fn=lambda: [gr.update(visible=True) for _ in tab_controls], _js='function(){ ' + jscode + ' }', inputs=[], outputs=tab_controls, show_progress=False)
|