diff options
| author | Jan Arve Saether <jan-arve.saether@digia.com> | 2014-01-31 14:36:49 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-14 15:11:31 +0100 |
| commit | e25e72f05b13718d56365c8ed14da58209adaaa5 (patch) | |
| tree | 5299d2d02fc2b86aeb88fad71bbd5df8296f9596 /src/controls/Styles | |
| parent | 4b11a2f2ab47683785cea0c3648f403c56dfa255 (diff) | |
| download | qtquickcontrols-e25e72f05b13718d56365c8ed14da58209adaaa5.tar.gz | |
Set baselineOffset on Styles/Base correctly
Will currently fix these styles:
ButtonStyle
CheckBoxStyle
ComboBoxStyle
RadioButtonStyle
TextFieldStyle and SpinBox style are not possible to fix yet, since they
require TextInput to be fixed (its baselineOffset seems to always be 0)
Change-Id: I78f90ed70ab1b6cc99c5e773e9aecd9b0342d7ae
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Diffstat (limited to 'src/controls/Styles')
| -rw-r--r-- | src/controls/Styles/Base/ButtonStyle.qml | 3 | ||||
| -rw-r--r-- | src/controls/Styles/Base/CheckBoxStyle.qml | 2 | ||||
| -rw-r--r-- | src/controls/Styles/Base/ComboBoxStyle.qml | 2 | ||||
| -rw-r--r-- | src/controls/Styles/Base/RadioButtonStyle.qml | 2 |
4 files changed, 9 insertions, 0 deletions
diff --git a/src/controls/Styles/Base/ButtonStyle.qml b/src/controls/Styles/Base/ButtonStyle.qml index ad14095c..237b0df0 100644 --- a/src/controls/Styles/Base/ButtonStyle.qml +++ b/src/controls/Styles/Base/ButtonStyle.qml @@ -135,6 +135,7 @@ Style { property Component label: Item { implicitWidth: row.implicitWidth implicitHeight: row.implicitHeight + baselineOffset: row.y + text.y + text.baselineOffset Row { id: row anchors.centerIn: parent @@ -144,6 +145,7 @@ Style { anchors.verticalCenter: parent.verticalCenter } Text { + id: text renderType: Text.NativeRendering anchors.verticalCenter: parent.verticalCenter text: control.text @@ -157,6 +159,7 @@ Style { anchors.fill: parent implicitWidth: Math.max(labelLoader.implicitWidth + padding.left + padding.right, backgroundLoader.implicitWidth) implicitHeight: Math.max(labelLoader.implicitHeight + padding.top + padding.bottom, backgroundLoader.implicitHeight) + baselineOffset: labelLoader.item ? padding.top + labelLoader.item.baselineOffset : 0 Loader { id: backgroundLoader diff --git a/src/controls/Styles/Base/CheckBoxStyle.qml b/src/controls/Styles/Base/CheckBoxStyle.qml index 8fb58207..c61746f5 100644 --- a/src/controls/Styles/Base/CheckBoxStyle.qml +++ b/src/controls/Styles/Base/CheckBoxStyle.qml @@ -88,6 +88,7 @@ Style { property Component label: Item { implicitWidth: text.implicitWidth + 2 implicitHeight: text.implicitHeight + baselineOffset: text.baselineOffset Rectangle { anchors.fill: text anchors.margins: -1 @@ -165,6 +166,7 @@ Style { property Component panel: Item { implicitWidth: Math.max(backgroundLoader.implicitWidth, row.implicitWidth + padding.left + padding.right) implicitHeight: Math.max(backgroundLoader.implicitHeight, labelLoader.implicitHeight + padding.top + padding.bottom,indicatorLoader.implicitHeight + padding.top + padding.bottom) + baselineOffset: labelLoader.item ? padding.top + labelLoader.item.baselineOffset : 0 Loader { id: backgroundLoader diff --git a/src/controls/Styles/Base/ComboBoxStyle.qml b/src/controls/Styles/Base/ComboBoxStyle.qml index 14f84c0d..55e60425 100644 --- a/src/controls/Styles/Base/ComboBoxStyle.qml +++ b/src/controls/Styles/Base/ComboBoxStyle.qml @@ -162,6 +162,7 @@ Style { /*! This defines the label of the button. */ property Component label: Item { implicitWidth: textitem.implicitWidth + 20 + baselineOffset: textitem.y + textitem.baselineOffset Text { id: textitem anchors.left: parent.left @@ -183,6 +184,7 @@ Style { anchors.fill: parent implicitWidth: backgroundLoader.implicitWidth implicitHeight: Math.max(labelLoader.implicitHeight + padding.top + padding.bottom, backgroundLoader.implicitHeight) + baselineOffset: labelLoader.item ? padding.top + labelLoader.item.baselineOffset: 0 Loader { id: backgroundLoader diff --git a/src/controls/Styles/Base/RadioButtonStyle.qml b/src/controls/Styles/Base/RadioButtonStyle.qml index 78f423ac..74fc0558 100644 --- a/src/controls/Styles/Base/RadioButtonStyle.qml +++ b/src/controls/Styles/Base/RadioButtonStyle.qml @@ -87,6 +87,7 @@ Style { property Component label: Item { implicitWidth: text.implicitWidth + 2 implicitHeight: text.implicitHeight + baselineOffset: text.y + text.baselineOffset Rectangle { anchors.fill: text anchors.margins: -1 @@ -146,6 +147,7 @@ Style { property Component panel: Item { implicitWidth: Math.max(backgroundLoader.implicitWidth, row.implicitWidth + padding.left + padding.right) implicitHeight: Math.max(backgroundLoader.implicitHeight, labelLoader.implicitHeight + padding.top + padding.bottom,indicatorLoader.implicitHeight + padding.top + padding.bottom) + baselineOffset: labelLoader.item ? padding.top + labelLoader.item.baselineOffset : 0 Loader { id:backgroundLoader |