Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2026-01-02 08:54:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '2.x/develop' into ftrack-config-to-settings

Browse source
This commit is contained in:
Milan Kolar 2020-11-25 22:11:22 +01:00
commit 0b193a8dac
1 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

29
pype/tools/settings/settings/widgets/item_types.py
View file

@ -1897,8 +1897,6 @@ class ListStrictWidget(QtWidgets.QWidget, InputObject):
return self._default_input_value
def set_value(self, value):
self.validate_value(value)
if self._is_overriden:
method_name = "apply_overrides"
elif not self._has_studio_override:
@ -2180,25 +2178,22 @@ class ModifiableDict(QtWidgets.QWidget, InputObject):
main_layout.setContentsMargins(0, 0, 0, 0)
main_layout.setSpacing(0)
label = input_data.get("label")
if as_widget:
body_widget = None
self.label_widget = label_widget
elif label is None:
body_widget = None
self.label_widget = None
else:
body_widget = ExpandingWidget(input_data["label"], self)
main_layout.addWidget(body_widget)
self.body_widget = body_widget
self.label_widget = body_widget.label_widget
collapsable = input_data.get("collapsable", True)
if collapsable:
collapsed = input_data.get("collapsed", True)
if not collapsed:
body_widget.toggle_content()
else:
body_widget.hide_toolbox(hide_content=False)
self.body_widget = body_widget
if body_widget is None:
content_parent_widget = self
else:
@ -2219,6 +2214,16 @@ class ModifiableDict(QtWidgets.QWidget, InputObject):
self.content_widget = content_widget
self.content_layout = content_layout
if body_widget:
collapsable = input_data.get("collapsable", True)
if collapsable:
collapsed = input_data.get("collapsed", True)
if not collapsed:
body_widget.toggle_content()
else:
body_widget.hide_toolbox(hide_content=False)
self.setAttribute(QtCore.Qt.WA_TranslucentBackground)
self.add_row(is_empty=True)