diff options
| -rw-r--r-- | mobile-widgets/qml/DownloadFromDiveComputer.qml | 12 | ||||
| -rw-r--r-- | mobile-widgets/qml/Settings.qml | 3 | ||||
| -rw-r--r-- | mobile-widgets/qml/TemplateComboBox.qml | 3 |
3 files changed, 9 insertions, 9 deletions
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 diff --git a/mobile-widgets/qml/Settings.qml b/mobile-widgets/qml/Settings.qml index cc2034bc9..a9cd4131c 100644 --- a/mobile-widgets/qml/Settings.qml +++ b/mobile-widgets/qml/Settings.qml @@ -91,9 +91,6 @@ Kirigami.ScrollablePage { } TemplateComboBox { id: defaultCylinderBox - Layout.preferredHeight: fontMetrics.height * 2.5 - inputMethodHints: Qt.ImhNoPredictiveText - Layout.fillWidth: true onActivated: { // the entry for 'no default cylinder' is known to be the top, but its text // is possibly translated so check against the index diff --git a/mobile-widgets/qml/TemplateComboBox.qml b/mobile-widgets/qml/TemplateComboBox.qml index 0583a7c6c..4ebaa7584 100644 --- a/mobile-widgets/qml/TemplateComboBox.qml +++ b/mobile-widgets/qml/TemplateComboBox.qml @@ -2,8 +2,11 @@ import QtQuick 2.11 import QtQuick.Controls 2.4 import QtQuick.Layouts 1.11 +import org.kde.kirigami 2.4 as Kirigami ComboBox { Layout.fillWidth: true + Layout.preferredHeight: Kirigami.Units.gridUnit * 2.5 + inputMethodHints: Qt.ImhNoPredictiveText font.pointSize: subsurfaceTheme.regularPointSize } |