From 5b2ff223151fdcbc4c51b840adf480ca8533a470 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Date: Thu, 25 Feb 2010 16:54:23 +0100
Subject: [PATCH] QmlDesigner.propertyEditor: some cleanup of GroupBox and
ColorGroupBox
---
.../propertyeditor/Qt/ColorGroupBox.qml | 18 ++++++++++--------
.../qmldesigner/propertyeditor/Qt/GroupBox.qml | 1 -
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorGroupBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorGroupBox.qml
index c2dbbbb122f..d06f63ebfc9 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 fda022299f9..90af54110b7 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;
--
GitLab