From 9199b6b7ebe96cdf09571ba874a103e8ed8c90ef Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Thu, 10 Aug 2023 11:20:46 +0300
Subject: add a custom UI element that combines accordion and checkbox rework
 hires fix UI to use accordion prevent bogus progress output in console when
 calculating hires fix dimensions

---
 modules/ui_components.py | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

(limited to 'modules/ui_components.py')

diff --git a/modules/ui_components.py b/modules/ui_components.py
index 8f8a7088..598ce738 100644
--- a/modules/ui_components.py
+++ b/modules/ui_components.py
@@ -72,3 +72,34 @@ class DropdownEditable(FormComponent, gr.Dropdown):
     def get_block_name(self):
         return "dropdown"
 
+
+class InputAccordion(gr.Checkbox):
+    global_index = 0
+
+    def __init__(self, value, **kwargs):
+        self.accordion_id = kwargs.get('elem_id')
+        if self.accordion_id is None:
+            self.accordion_id = f"input-accordion-{self.global_index}"
+            self.global_index += 1
+
+        kwargs['elem_id'] = self.accordion_id + "-checkbox"
+        kwargs['visible'] = False
+        super().__init__(value, **kwargs)
+
+        self.change(fn=None, _js='function(checked){ inputAccordionChecked("' + self.accordion_id + '", checked); }', inputs=[self])
+
+        self.accordion = gr.Accordion(kwargs.get('label', 'Accordion'), open=value, elem_id=self.accordion_id, elem_classes=['input-accordion'])
+
+    def extra(self):
+        return gr.Column(elem_id=self.accordion_id + '-extra', elem_classes='input-accordion-extra', min_width=0)
+
+    def __enter__(self):
+        self.accordion.__enter__()
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        self.accordion.__exit__(exc_type, exc_val, exc_tb)
+
+    def get_block_name(self):
+        return "checkbox"
+
-- 
cgit v1.2.1


From 08838105923255e66ef0d58115fc9ce671d202ae Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Thu, 10 Aug 2023 13:02:50 +0300
Subject: comment for InputAccordion

---
 modules/ui_components.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'modules/ui_components.py')

diff --git a/modules/ui_components.py b/modules/ui_components.py
index 598ce738..9df9ddf4 100644
--- a/modules/ui_components.py
+++ b/modules/ui_components.py
@@ -74,6 +74,11 @@ class DropdownEditable(FormComponent, gr.Dropdown):
 
 
 class InputAccordion(gr.Checkbox):
+    """A gr.Accordion that can be used as an input - returns True if open, False if closed.
+
+    Actaully just a hidden checkbox, but creates an accordion that follows and is followed by the state of the checkbox.
+    """
+
     global_index = 0
 
     def __init__(self, value, **kwargs):
@@ -91,6 +96,19 @@ class InputAccordion(gr.Checkbox):
         self.accordion = gr.Accordion(kwargs.get('label', 'Accordion'), open=value, elem_id=self.accordion_id, elem_classes=['input-accordion'])
 
     def extra(self):
+        """Allows you to put something into the label of the accordion.
+
+        Use it like this:
+
+        ```
+        with InputAccordion(False, label="Accordion") as acc:
+            with acc.extra():
+                FormHTML(value="hello", min_width=0)
+
+            ...
+        ```
+        """
+
         return gr.Column(elem_id=self.accordion_id + '-extra', elem_classes='input-accordion-extra', min_width=0)
 
     def __enter__(self):
-- 
cgit v1.2.1


From 4d93f48f090e19a81d1608837e8e6449045601a8 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Thu, 10 Aug 2023 15:32:54 +0300
Subject: fix for multiple input accordions

---
 modules/ui_components.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules/ui_components.py')

diff --git a/modules/ui_components.py b/modules/ui_components.py
index 9df9ddf4..bfe2fbd9 100644
--- a/modules/ui_components.py
+++ b/modules/ui_components.py
@@ -84,8 +84,8 @@ class InputAccordion(gr.Checkbox):
     def __init__(self, value, **kwargs):
         self.accordion_id = kwargs.get('elem_id')
         if self.accordion_id is None:
-            self.accordion_id = f"input-accordion-{self.global_index}"
-            self.global_index += 1
+            self.accordion_id = f"input-accordion-{InputAccordion.global_index}"
+            InputAccordion.global_index += 1
 
         kwargs['elem_id'] = self.accordion_id + "-checkbox"
         kwargs['visible'] = False
-- 
cgit v1.2.1