From 3f8fa36a0cd376c142c93d62d7912df05d37ac60 Mon Sep 17 00:00:00 2001
From: Vladimir Mandic <mandic00@live.com>
Date: Sun, 21 Jan 2024 08:49:04 -0500
Subject: [PATCH] fix en display

---
 extensions-builtin/sd-webui-controlnet | 2 +-
 javascript/extraNetworks.js            | 7 +++++--
 javascript/sdnext.css                  | 3 ++-
 modules/ui_extra_networks.py           | 4 +++-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/extensions-builtin/sd-webui-controlnet b/extensions-builtin/sd-webui-controlnet
index 00cd2ca52..137fc1c89 160000
--- a/extensions-builtin/sd-webui-controlnet
+++ b/extensions-builtin/sd-webui-controlnet
@@ -1 +1 @@
-Subproject commit 00cd2ca52550933a329f3d7cedea0b1f103fe250
+Subproject commit 137fc1c89aeb5243be5f2a1b97a1fc47d6fa15f6
diff --git a/javascript/extraNetworks.js b/javascript/extraNetworks.js
index 81384c317..a8ba3bcf5 100644
--- a/javascript/extraNetworks.js
+++ b/javascript/extraNetworks.js
@@ -428,22 +428,25 @@ function setupExtraNetworksForTab(tabname) {
       if (window.opts.extra_networks_card_cover === 'cover') {
         en.style.transition = '';
         en.style.zIndex = 100;
+        en.style.top = '13em';
         en.style.position = 'absolute';
         en.style.right = 'unset';
         en.style.width = 'unset';
         en.style.height = 'unset';
         gradioApp().getElementById(`${tabname}_settings`).parentNode.style.width = 'unset';
       } else if (window.opts.extra_networks_card_cover === 'sidebar') {
-        en.style.transition = 'width 0.2s ease';
         en.style.zIndex = 100;
         en.style.position = 'absolute';
         en.style.right = '0';
-        en.style.width = `${window.opts.extra_networks_sidebar_width}vw`;
+        en.style.top = '13em';
         en.style.height = '-webkit-fill-available';
+        en.style.transition = 'width 0.3s ease';
+        en.style.width = `${window.opts.extra_networks_sidebar_width}vw`;
         gradioApp().getElementById(`${tabname}_settings`).parentNode.style.width = `${100 - 2 - window.opts.extra_networks_sidebar_width}vw`;
       } else {
         en.style.transition = '';
         en.style.zIndex = 0;
+        en.style.top = 0;
         en.style.position = 'relative';
         en.style.right = 'unset';
         en.style.width = 'unset';
diff --git a/javascript/sdnext.css b/javascript/sdnext.css
index 70b10c988..0776db76f 100644
--- a/javascript/sdnext.css
+++ b/javascript/sdnext.css
@@ -188,7 +188,8 @@ table.settings-value-table td { padding: 0.4em; border: 1px solid #ccc; max-widt
 #extensions .date{ opacity: 0.85; font-size: var(--text-sm); }
 
 /* extra networks */
-.extra-networks>div { margin: 0; border-bottom: none !important; gap: 0.3em 0; }
+#txt2img_extra_networks, #img2img_extra_networks, #control_extra_networks { width: 0; }
+.extra-networks > div { margin: 0; border-bottom: none !important; gap: 0.3em 0; }
 .extra-networks .second-line { display: flex; width: -moz-available; width: -webkit-fill-available; gap: 0.3em; box-shadow: var(--input-shadow); }
 .extra-networks .search { flex: 1; }
 .extra-networks .description { flex: 3; }
diff --git a/modules/ui_extra_networks.py b/modules/ui_extra_networks.py
index cb7f0b747..4d660d08e 100644
--- a/modules/ui_extra_networks.py
+++ b/modules/ui_extra_networks.py
@@ -194,6 +194,8 @@ class ExtraNetworksPage:
         except Exception as e:
             self.items = []
             shared.log.error(f'Extra networks error listing items: class={self.__class__.__name__} tab={tabname} {e}')
+            if os.environ.get('SD_EN_DEBUG', None):
+                errors.display(e, f'Extra networks error listing items: class={self.__class__.__name__} tab={tabname}')
         for item in self.items:
             if item is None:
                 continue
@@ -332,7 +334,7 @@ class ExtraNetworksPage:
             if item.get('local_preview', None) is None:
                 item['local_preview'] = f'{base}.{shared.opts.samples_format}'
             if shared.opts.diffusers_dir in base:
-                match = re.search(r"models--([^/]+)/", base)
+                match = re.search(r"models--([^/^\\]+)[/\\]", base)
                 base = os.path.join(reference_path, match[1])
                 model_path = os.path.join(shared.opts.diffusers_dir, match[0])
                 item['local_preview'] = f'{os.path.join(model_path, match[1])}.{shared.opts.samples_format}'