diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorGroupBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorGroupBox.qml index c2dbbbb122ff11809fffc2152db5c0f1108a719e..d06f63ebfc94454b3606fd76be09d2d3ea0b5909 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorGroupBox.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorGroupBox.qml @@ -11,14 +11,14 @@ QExtGroupBox { property var oldMaximumHeight; onFinishedChanged: { - maximumHeight = height; oldMaximumHeight = maximumHeight; visible = false; visible = true; if (finished) - collapsed = true; + collapsed = true; } + QWidget { id: colorButtonWidget height: 32 @@ -46,10 +46,10 @@ QExtGroupBox { if (checked) { colorGroupBox.collapsed = false; colorButtonWidget.visible = true; - } else { + } else { colorGroupBox.collapsed = true; colorButtonWidget.visible = true; - } + } } } @@ -60,6 +60,8 @@ QExtGroupBox { } } + + layout: VerticalLayout { topMargin: 36 @@ -95,10 +97,10 @@ QExtGroupBox { } QSpinBox { - maximum: 359 + maximum: 255 value: colorControl.hue; onValueChanged: if (colorControl.hue != value) - colorControl.hue=value; + colorControl.hue=value; } } @@ -114,7 +116,7 @@ QExtGroupBox { maximum: 255 value: colorControl.saturation; onValueChanged: if (colorControl.saturation !=value) - colorControl.saturation=value; + colorControl.saturation=value; } } @@ -129,7 +131,7 @@ QExtGroupBox { maximum: 255 value: colorControl.value; onValueChanged: if (Math.floor(colorControl.value)!=value) - colorControl.value=value; + colorControl.value=value; } } } diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/GroupBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/GroupBox.qml index fda022299f9f45f3c87973e4ee85f58dffb7a251..90af54110b738fbade1fe9e0d1573e792d6c77fa 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/GroupBox.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/GroupBox.qml @@ -12,7 +12,6 @@ QExtGroupBox { onFinishedChanged: { checkBox.raise(); - maximumHeight = height; oldMaximumHeight = maximumHeight; visible = false; visible = true;