diff options
author | Thomas Hartmann <Thomas.Hartmann@theqtcompany.com> | 2016-07-28 12:33:07 +0200 |
---|---|---|
committer | Alessandro Portale <alessandro.portale@qt.io> | 2016-07-28 11:07:43 +0000 |
commit | 638279cc98d1d4262aa38b5223809c9519ad17bd (patch) | |
tree | 7395e011b604340806a464c01a957f5c93deb27e | |
parent | c7ba291c68bc97f7236e93d6c0235a6a66db5b48 (diff) | |
download | qt-creator-638279cc98d1d4262aa38b5223809c9519ad17bd.tar.gz |
QmlDesigner.PropertyEditor: Unify size of controls
Change-Id: I375396ada5f394247346c3a66319796295894641
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
8 files changed, 9 insertions, 8 deletions
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/BoolButtonRowButton.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/BoolButtonRowButton.qml index 28ebab1804..2b413caaef 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/BoolButtonRowButton.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/BoolButtonRowButton.qml @@ -84,6 +84,6 @@ ButtonRowButton { ExtendedFunctionButton { backendValue: boolButtonRowButton.backendValue x: 2 - y: 4 + anchors.verticalCenter: parent.verticalCenter } } diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CheckBox.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CheckBox.qml index 263e154bf0..d69490d53a 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CheckBox.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CheckBox.qml @@ -39,6 +39,7 @@ Controls.CheckBox { ExtendedFunctionButton { x: 22 + anchors.verticalCenter: parent.verticalCenter backendValue: checkBox.backendValue visible: checkBox.enabled } diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ComboBox.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ComboBox.qml index 8f98203271..08f76b4f25 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ComboBox.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ComboBox.qml @@ -112,7 +112,7 @@ Controls.ComboBox { ExtendedFunctionButton { x: 2 - y: 6 + anchors.verticalCenter: parent.verticalCenter backendValue: comboBox.backendValue visible: comboBox.enabled } diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomComboBoxStyle.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomComboBoxStyle.qml index 318f689a63..97d10c2c78 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomComboBoxStyle.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomComboBoxStyle.qml @@ -35,7 +35,7 @@ ComboBoxStyle { background: Item { implicitWidth: 120 - implicitHeight: 25 + implicitHeight: 24 Rectangle { anchors.fill: parent diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomSpinBoxStyle.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomSpinBoxStyle.qml index e6f73eebb2..bdfb067640 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomSpinBoxStyle.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomSpinBoxStyle.qml @@ -60,13 +60,13 @@ SpinBoxStyle { height: 4 source: "image://icons/down-arrow" x: 1 - y: 2.5 // Hack! Spinbox sets an non-int offset, somewhere + y: 3 } } background: Rectangle { implicitWidth: Math.max(64, styleData.contentWidth) - implicitHeight: 23 + implicitHeight: 24 color: creatorTheme.QmlDesignerBackgroundColorDarker border.color: creatorTheme.QmlDesignerBorderColor } diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FontComboBox.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FontComboBox.qml index 6b8c0fea64..dafd287dd8 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FontComboBox.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FontComboBox.qml @@ -68,7 +68,7 @@ Controls.ComboBox { ExtendedFunctionButton { x: 2 - y: 4 + anchors.verticalCenter: parent.verticalCenter backendValue: comboBox.backendValue visible: comboBox.enabled } diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/LineEdit.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/LineEdit.qml index 6d9e86d23a..afabd39276 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/LineEdit.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/LineEdit.qml @@ -52,7 +52,7 @@ Controls.TextField { ExtendedFunctionButton { x: 2 - y: 6 + anchors.verticalCenter: parent.verticalCenter backendValue: lineEdit.backendValue visible: lineEdit.enabled && showExtendedFunctionButton } diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/SpinBox.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/SpinBox.qml index 08ac2a0157..2a07b05817 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/SpinBox.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/SpinBox.qml @@ -35,7 +35,7 @@ Controls.SpinBox { ExtendedFunctionButton { x: 2 - y: 4 + anchors.verticalCenter: parent.verticalCenter backendValue: spinBox.backendValue visible: spinBox.enabled } |