diff options
author | Sami Nurmenniemi <sami.nurmenniemi@qt.io> | 2017-09-29 12:24:43 +0300 |
---|---|---|
committer | Sami Nurmenniemi <sami.nurmenniemi@qt.io> | 2017-11-22 10:41:25 +0000 |
commit | 366c0c0e392c27624f22d3bb3c0e6732e1de04f6 (patch) | |
tree | c942724ff9d34bb1310d0f35662dd405249becba /src/settingsui/timedate/CustomComboBox.qml | |
parent | 62ba7239d6d1f498bc0e1a0c81fdf42ef835b1b7 (diff) |
Fix date & time setting screens
Task-number: QTBUG-63091
Change-Id: Id2dbd54f74bcf7fed0577e7ad3dadce1e2748f78
Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io>
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
Diffstat (limited to 'src/settingsui/timedate/CustomComboBox.qml')
-rw-r--r-- | src/settingsui/timedate/CustomComboBox.qml | 28 |
1 files changed, 5 insertions, 23 deletions
diff --git a/src/settingsui/timedate/CustomComboBox.qml b/src/settingsui/timedate/CustomComboBox.qml index 22c0bd1..e7e1da4 100644 --- a/src/settingsui/timedate/CustomComboBox.qml +++ b/src/settingsui/timedate/CustomComboBox.qml @@ -32,27 +32,11 @@ import QtGraphicalEffects 1.0 ComboBox { id: comboBox - delegate: ItemDelegate { - id: del - background: Item {} - width: comboBox.width - contentItem: Text { - anchors.left: del.left - anchors.leftMargin: del.width * 0.15 - verticalAlignment: Text.AlignVCenter - font.pixelSize: comboBox.height * 0.375 - color: comboBox.currentIndex == index ? "#41cd52" : "white" - text: modelData - font.family: appFont - font.styleName: comboBox.currentIndex == index ? "Bold" : "Regular" - elide: Text.ElideRight - } - } indicator: Image { id: indicatorImage height: comboBox.height * 0.4 anchors.right: comboBox.right - anchors.rightMargin: comboBox.width * 0.15 + anchors.rightMargin: pluginMain.margin anchors.verticalCenter: comboBox.verticalCenter fillMode: Image.PreserveAspectFit rotation: -90 @@ -68,15 +52,14 @@ ComboBox { } contentItem: Text { anchors.left: comboBox.left - anchors.leftMargin: comboBox.width * 0.15 + anchors.leftMargin: pluginMain.margin verticalAlignment: Text.AlignVCenter - font.pixelSize: comboBox.height * 0.375 - font.bold: true + font.pixelSize: pluginMain.valueFontSize + font.family: appFont + font.styleName: "SemiBold" color: "white" elide: Text.ElideRight text: comboBox.displayText - font.family: appFont - font.styleName: "SemiBold" } background: Rectangle { color: "transparent" @@ -95,7 +78,6 @@ ComboBox { implicitHeight: root.height - (comboBox.y + comboBox.height) model: comboBox.popup.visible ? comboBox.delegateModel : null currentIndex: comboBox.currentIndex - onCurrentIndexChanged: positionViewAtIndex(listView.currentIndex, ListView.beginning) } onOpened: { |