From f1192c419ef7123d4ababa365b226b5b24d160f3 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann <Thomas.Hartmann@nokia.com> Date: Fri, 26 Feb 2010 14:51:48 +0100 Subject: [PATCH] QmlDesigner.propertyEditor: solve collapsing colorBoxes issues: --- .../propertyeditor/Qt/ColorGroupBox.qml | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorGroupBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorGroupBox.qml index d06f63ebfc9..56211f5fd14 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorGroupBox.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorGroupBox.qml @@ -9,15 +9,26 @@ QExtGroupBox { property var backendColor property var oldMaximumHeight; + + property var startupCollapse: selectionChanged; + property var firstTime: true; onFinishedChanged: { oldMaximumHeight = maximumHeight; - visible = false; - visible = true; - if (finished) - collapsed = true; + //visible = false; + //visible = true; + //if (finished) + //collapsed = true; } - + + onStartupCollapseChanged: { + oldMaximumHeight = maximumHeight; + if (!collapsed && firstTime) { + collapsed = true; + colorButton.checked = false; + firstTime = false; + } + } QWidget { id: colorButtonWidget @@ -36,6 +47,7 @@ QExtGroupBox { } ColorButton { + id: colorButton color: colorGroupBox.backendColor.value; checkable: true; checked: false; @@ -43,7 +55,7 @@ QExtGroupBox { minimumWidth: 18; onClicked: { - if (checked) { + if (checked) { colorGroupBox.collapsed = false; colorButtonWidget.visible = true; } else { -- GitLab