aboutsummaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorThomas Hartmann <Thomas.Hartmann@digia.com>2014-04-07 16:14:36 +0200
committerThomas Hartmann <Thomas.Hartmann@digia.com>2014-04-07 16:27:39 +0200
commitb50b7d20d94b92e3af60c99bb88cecee2e0a28a4 (patch)
treefd9cb224d2dbf62095b24f74fd56afc2977808b4 /share
parent184bfebaabf019a46989c72e12f99997b6eaa7db (diff)
QmlDesigner.PropertyEditor: Give more space to color LineEdit
Task-number: QTCREATORBUG-11992 Change-Id: Icb884847633bd421e3dc7bc034d598ef84d33422 Reviewed-by: Marco Bubke <marco.bubke@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Diffstat (limited to 'share')
-rw-r--r--share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ColorEditor.qml2
-rw-r--r--share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/LineEdit.qml2
2 files changed, 2 insertions, 2 deletions
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ColorEditor.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ColorEditor.qml
index 168925f6fb..37f9b63266 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ColorEditor.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ColorEditor.qml
@@ -138,7 +138,7 @@ Column {
onAccepted: {
colorEditor.color = textField.text
}
- Layout.preferredWidth: 80
+ Layout.fillWidth: true
}
ColorCheckButton {
id: checkButton
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/LineEdit.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/LineEdit.qml
index bcdc246062..1360264d99 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/LineEdit.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/LineEdit.qml
@@ -86,7 +86,7 @@ Controls.TextField {
padding.top: 3
padding.bottom: 1
padding.left: 16
- padding.right: 16
+ padding.right: lineEdit.showTranslateCheckBox ? 16 : 1
placeholderTextColor: "gray"
background: Rectangle {
implicitWidth: 100