diff options
author | Michael Bohlender <michael.bohlender@kdemail.net> | 2017-04-19 13:34:04 +0200 |
---|---|---|
committer | Michael Bohlender <michael.bohlender@kdemail.net> | 2017-04-19 13:34:04 +0200 |
commit | 660cb1649a4463a2a808c160a7d141b2f31ac822 (patch) | |
tree | 439e7cc9476f29981188ed76da0a0ef9d586d48b | |
parent | 962f09c6f6ceedd96eced193360c1b106f555fac (diff) | |
download | kube-660cb1649a4463a2a808c160a7d141b2f31ac822.tar.gz kube-660cb1649a4463a2a808c160a7d141b2f31ac822.zip |
use kube.label in kube.combobox
-rw-r--r-- | framework/qml/ComboBox.qml | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/framework/qml/ComboBox.qml b/framework/qml/ComboBox.qml index 9fea0ca3..f4529f7b 100644 --- a/framework/qml/ComboBox.qml +++ b/framework/qml/ComboBox.qml | |||
@@ -32,13 +32,11 @@ T.ComboBox { | |||
32 | spacing: Units.largeSpacing | 32 | spacing: Units.largeSpacing |
33 | padding: Units.smallSpacing | 33 | padding: Units.smallSpacing |
34 | 34 | ||
35 | contentItem: Text { | 35 | contentItem: Label { |
36 | leftPadding: Units.smallSpacing | 36 | leftPadding: Units.smallSpacing |
37 | rightPadding: Units.largeSpacing | 37 | rightPadding: Units.largeSpacing |
38 | 38 | ||
39 | color: Colors.textColor | ||
40 | text: root.displayText | 39 | text: root.displayText |
41 | //TODO font: | ||
42 | horizontalAlignment: Text.AlignLeft | 40 | horizontalAlignment: Text.AlignLeft |
43 | verticalAlignment: Text.AlignVCenter | 41 | verticalAlignment: Text.AlignVCenter |
44 | elide: Text.ElideRight | 42 | elide: Text.ElideRight |
@@ -80,7 +78,7 @@ T.ComboBox { | |||
80 | width: root.popup.width | 78 | width: root.popup.width |
81 | height: Units.gridUnit * 1.5 | 79 | height: Units.gridUnit * 1.5 |
82 | 80 | ||
83 | contentItem: Text { | 81 | contentItem: Label { |
84 | padding: Units.smallSpacing | 82 | padding: Units.smallSpacing |
85 | text: root.textRole ? (Array.isArray(root.model) ? modelData[root.textRole] : model[root.textRole]) : modelData | 83 | text: root.textRole ? (Array.isArray(root.model) ? modelData[root.textRole] : model[root.textRole]) : modelData |
86 | color: root.highlightedIndex === index ? Colors.highlightedTextColor : Colors.textColor | 84 | color: root.highlightedIndex === index ? Colors.highlightedTextColor : Colors.textColor |