From 01ae1ef294226fce524b6045d660400dcb8f5de1 Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Tue, 1 Sep 2020 12:55:26 +0200
Subject: [PATCH] checkbox key requires to have widget specification in
 children

---
 .../config_setting/widgets/inputs.py          | 59 ++++++++++---------
 .../config_setting/widgets/lib.py             |  4 --
 2 files changed, 30 insertions(+), 33 deletions(-)

diff --git a/pype/tools/config_setting/config_setting/widgets/inputs.py b/pype/tools/config_setting/config_setting/widgets/inputs.py
index 3737d8c858..cf1e7b017e 100644
--- a/pype/tools/config_setting/config_setting/widgets/inputs.py
+++ b/pype/tools/config_setting/config_setting/widgets/inputs.py
@@ -1684,47 +1684,33 @@ class DictWidget(QtWidgets.QWidget, ConfigObject):
         content_layout = QtWidgets.QVBoxLayout(content_widget)
         content_layout.setContentsMargins(3, 3, 0, 3)
 
+        body_widget.set_content_widget(content_widget, (4, 4, 0, 4))
+
+        self.body_widget = body_widget
         self.content_widget = content_widget
         self.content_layout = content_layout
 
-        body_widget.set_content_widget(content_widget, (4, 4, 0, 4))
         self.label_widget = body_widget.label_widget
 
+        self.setAttribute(QtCore.Qt.WA_StyledBackground)
+
+        self.checkbox_widget = None
+        self.checkbox_key = input_data.get("checkbox_key")
+
+        for child_data in input_data.get("children", []):
+            self.add_children_gui(child_data, values)
+
         expandable = input_data.get("expandable", True)
-        if expandable:
+        if len(self.input_fields) == 1 and self.checkbox_widget:
+            body_widget.hide_toolbox(hide_content=True)
+
+        elif expandable:
             expanded = input_data.get("expanded", False)
             if expanded:
                 body_widget.toggle_content()
         else:
             body_widget.hide_toolbox(hide_content=False)
 
-        self.setAttribute(QtCore.Qt.WA_StyledBackground)
-
-        checkbox_widget = None
-        checkbox_key = input_data.get("checkbox_key")
-        if checkbox_key:
-            checkbox_input_data = {
-                "key": checkbox_key
-            }
-            checkbox_widget = BooleanWidget(
-                checkbox_input_data, values, self.keys, self,
-                label_widget=self.label_widget
-            )
-            if expandable:
-                body_widget.top_part.layout().addWidget(checkbox_widget)
-            else:
-                top_layout.addWidget(checkbox_widget)
-
-            self.input_fields.append(checkbox_widget)
-            checkbox_widget.value_changed.connect(self._on_value_change)
-
-        children_data = input_data.get("children", [])
-        if expandable and checkbox_widget and not children_data:
-            body_widget.hide_toolbox(hide_content=True)
-
-        for child_data in children_data:
-            self.add_children_gui(child_data, values)
-
     def remove_overrides(self):
         self._is_overriden = False
         self._is_modified = False
@@ -1868,6 +1854,10 @@ class DictWidget(QtWidgets.QWidget, ConfigObject):
     def add_children_gui(self, child_configuration, values):
         item_type = child_configuration["type"]
         klass = TypeToKlass.types.get(item_type)
+        if self.checkbox_key and not self.checkbox_widget:
+            key = child_configuration.get("key")
+            if key == self.checkbox_key:
+                return self._add_checkbox_child(child_configuration, values)
 
         item = klass(
             child_configuration, values, self.keys, self
@@ -1878,6 +1868,17 @@ class DictWidget(QtWidgets.QWidget, ConfigObject):
         self.input_fields.append(item)
         return item
 
+    def _add_checkbox_child(self, child_configuration, values):
+        item = BooleanWidget(
+            child_configuration, values, self.keys, self, self.label_widget
+        )
+        item.value_changed.connect(self._on_value_change)
+
+        self.body_widget.top_part.layout().addWidget(item)
+        self.checkbox_widget = item
+        self.input_fields.append(item)
+        return item
+
     def overrides(self):
         if not self.is_overriden and not self.child_overriden:
             return NOT_SET, False
diff --git a/pype/tools/config_setting/config_setting/widgets/lib.py b/pype/tools/config_setting/config_setting/widgets/lib.py
index ac18f09669..c416f7a5b0 100644
--- a/pype/tools/config_setting/config_setting/widgets/lib.py
+++ b/pype/tools/config_setting/config_setting/widgets/lib.py
@@ -233,10 +233,6 @@ def validate_keys_are_unique(schema_data, keys=None):
     for child in children:
         child_queue.put(child)
 
-    checkbox_key = schema_data.get("checkbox_key")
-    if checkbox_key:
-        child_queue.put({"key": checkbox_key})
-
     child_inputs = []
     while not child_queue.empty():
         child = child_queue.get()