From 660cb1649a4463a2a808c160a7d141b2f31ac822 Mon Sep 17 00:00:00 2001 From: Michael Bohlender Date: Wed, 19 Apr 2017 13:34:04 +0200 Subject: use kube.label in kube.combobox --- framework/qml/ComboBox.qml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'framework/qml') 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 { spacing: Units.largeSpacing padding: Units.smallSpacing - contentItem: Text { + contentItem: Label { leftPadding: Units.smallSpacing rightPadding: Units.largeSpacing - color: Colors.textColor text: root.displayText - //TODO font: horizontalAlignment: Text.AlignLeft verticalAlignment: Text.AlignVCenter elide: Text.ElideRight @@ -80,7 +78,7 @@ T.ComboBox { width: root.popup.width height: Units.gridUnit * 1.5 - contentItem: Text { + contentItem: Label { padding: Units.smallSpacing text: root.textRole ? (Array.isArray(root.model) ? modelData[root.textRole] : model[root.textRole]) : modelData color: root.highlightedIndex === index ? Colors.highlightedTextColor : Colors.textColor -- cgit v1.2.3