Commit 1e6be176 authored by Jens Bache-Wiig's avatar Jens Bache-Wiig Committed by The Qt Project
Browse files

Improve look of Label


- Dont hardcode 11 px(!)
- Set colorGroup when disabled
- Use NativeRendering

Change-Id: I8ad7ca3244c952088fb7ef2704fd0d65f90d9f7c
Reviewed-by: default avatarJens Bache-Wiig <jens.bache-wiig@digia.com>
parent d8df1613
6.2 5.10 5.11 5.12 5.12.1 5.12.10 5.12.11 5.12.12 5.12.2 5.12.3 5.12.4 5.12.5 5.12.6 5.12.7 5.12.8 5.12.9 5.13 5.13.0 5.13.1 5.13.2 5.14 5.14.0 5.14.1 5.14.2 5.15 5.15.0 5.15.1 5.15.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9 5.9.8 dev old/5.1 old/5.2 wip/calendar wip/tizen v5.15.0-alpha1 v5.14.1 v5.14.0 v5.14.0-rc2 v5.14.0-rc1 v5.14.0-beta3 v5.14.0-beta2 v5.14.0-beta1 v5.14.0-alpha1 v5.13.2 v5.13.1 v5.13.0 v5.13.0-rc3 v5.13.0-rc2 v5.13.0-rc1 v5.13.0-beta4 v5.13.0-beta3 v5.13.0-beta2 v5.13.0-beta1 v5.13.0-alpha1 v5.12.7 v5.12.6 v5.12.5 v5.12.4 v5.12.3 v5.12.2 v5.12.1 v5.12.0 v5.12.0-rc2 v5.12.0-rc1 v5.12.0-beta4 v5.12.0-beta3 v5.12.0-beta2 v5.12.0-beta1 v5.12.0-alpha1 v5.11.3 v5.11.2 v5.11.1 v5.11.0 v5.11.0-rc2 v5.11.0-rc1 v5.11.0-beta4 v5.11.0-beta3 v5.11.0-beta2 v5.11.0-beta1 v5.11.0-alpha1 v5.10.1 v5.10.0 v5.10.0-rc3 v5.10.0-rc2 v5.10.0-rc1 v5.10.0-beta4 v5.10.0-beta3 v5.10.0-beta2 v5.10.0-beta1 v5.10.0-alpha1 v5.9.9 v5.9.8 v5.9.7 v5.9.6 v5.9.5 v5.9.4 v5.9.3 v5.9.2 v5.9.1 v5.9.0 v5.9.0-rc2 v5.9.0-rc1 v5.9.0-beta4 v5.9.0-beta3 v5.9.0-beta2 v5.9.0-beta1 v5.9.0-alpha1 v5.8.0 v5.8.0-rc1 v5.8.0-beta1 v5.8.0-alpha1 v5.7.1 v5.7.0 v5.7.0-rc1 v5.7.0-beta1 v5.7.0-alpha1 v5.6.3 v5.6.2 v5.6.1 v5.6.1-1 v5.6.0 v5.6.0-rc1 v5.6.0-beta1 v5.6.0-alpha1 v5.5.1 v5.5.0 v5.5.0-rc1 v5.5.0-beta1 v5.5.0-alpha1 v5.4.2 v5.4.1 v5.4.0 v5.4.0-rc1 v5.4.0-beta1 v5.4.0-alpha1 v5.3.2 v5.3.1 v5.3.0 v5.3.0-rc1 v5.3.0-beta1 v5.3.0-alpha1 v5.2.1 v5.2.0 v5.2.0-rc1 v5.2.0-beta1 v5.2.0-alpha1 v5.1.1 v5.1.0 v5.1.0-rc2 v5.1.0-rc1 v5.1.0-beta1 v5.1.0-alpha1
No related merge requests found
Showing with 11 additions and 8 deletions
......@@ -80,7 +80,10 @@ Text {
*/
id: label
font.pixelSize: 11
color: pal.text
SystemPalette {id:pal}
renderType: Text.NativeRendering
SystemPalette {
id: pal
colorGroup: enabled ? SystemPalette.Active : SystemPalette.Disabled
}
}
......@@ -55,7 +55,7 @@ QtObject {
property Component intLayout: RowLayout {
spacing: 4
Text {
Label {
text: name + ":"
Layout.minimumWidth: 100
}
......@@ -75,7 +75,7 @@ QtObject {
property Component realLayout: RowLayout {
spacing: 4
Text {
Label {
text: name + ":"
Layout.minimumWidth: 100
}
......@@ -106,7 +106,7 @@ QtObject {
property Component stringLayout: RowLayout {
spacing: 4
Text {
Label {
text: name + ":"
width: 100
}
......@@ -125,12 +125,12 @@ QtObject {
property Component readonlyLayout: RowLayout {
height: 20
Text {
Label {
id: text
height: 20
text: name + ":"
}
Text {
Label {
height: 20
anchors.right: parent.right
Layout.horizontalSizePolicy: Layout.Expanding
......@@ -142,7 +142,7 @@ QtObject {
id: enumLayout
spacing: 4
height: 20
Text {
Label {
text: name + ":"
Layout.minimumWidth: 100
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment