From 3d871ef0de72c175df555d68de09d551c307490e Mon Sep 17 00:00:00 2001 From: jan Iversen Date: Tue, 14 Jan 2020 21:29:08 +0100 Subject: 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 Signed-off-by: Dirk Hohndel --- mobile-widgets/qml/DownloadFromDiveComputer.qml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'mobile-widgets/qml/DownloadFromDiveComputer.qml') diff --git a/mobile-widgets/qml/DownloadFromDiveComputer.qml b/mobile-widgets/qml/DownloadFromDiveComputer.qml index d71f90c70..1a6503f12 100644 --- a/mobile-widgets/qml/DownloadFromDiveComputer.qml +++ b/mobile-widgets/qml/DownloadFromDiveComputer.qml @@ -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 -- cgit v1.2.3-70-g09d2