mobile-widgets: do not use fontmetric for height

In order to remove fontMetrics from QML, replace references (height)
in DownloadFromDiveComputer and Settings

Add include kirigami as needed

Signed-off-by: jan Iversen <jan@casacondor.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
jan Iversen 2020-01-14 21:29:08 +01:00 committed by Dirk Hohndel
parent 2cc215d3f2
commit 3d871ef0de
3 changed files with 9 additions and 9 deletions

View file

@ -57,12 +57,12 @@ Kirigami.Page {
Controls.ComboBox {
id: comboVendor
Layout.fillWidth: true
Layout.preferredHeight: fontMetrics.height * 2.5
Layout.preferredHeight: Kirigami.Units.gridUnit * 2.5
model: vendorList
currentIndex: -1
delegate: Controls.ItemDelegate {
width: comboVendor.width
height: fontMetrics.height * 2.0
height: Kirigami.Units.gridUnit * 2.5
contentItem: Text {
text: modelData
font.pointSize: subsurfaceTheme.regularPointSize
@ -99,12 +99,12 @@ Kirigami.Page {
Controls.ComboBox {
id: comboProduct
Layout.fillWidth: true
Layout.preferredHeight: fontMetrics.height * 2.5
Layout.preferredHeight: Kirigami.Units.gridUnit * 2.5
model: null
currentIndex: -1
delegate: Controls.ItemDelegate {
width: comboProduct.width
height: fontMetrics.height * 2.0
height: Kirigami.Units.gridUnit * 2.5
contentItem: Text {
text: modelData
font.pointSize: subsurfaceTheme.regularPointSize
@ -139,12 +139,12 @@ Kirigami.Page {
Controls.ComboBox {
id: comboConnection
Layout.fillWidth: true
Layout.preferredHeight: fontMetrics.height * 2.5
Layout.preferredHeight: Kirigami.Units.gridUnit * 2.5
model: connectionListModel
currentIndex: -1
delegate: Controls.ItemDelegate {
width: comboConnection.width
height: fontMetrics.height * 2.0
height: Kirigami.Units.gridUnit * 2.5
contentItem: Text {
text: modelData
font.pointSize: subsurfaceTheme.smallPointSize