From be1d3a7986a8edc5f72ee7efdba5ec4618cd8870 Mon Sep 17 00:00:00 2001 From: Jan Mulder Date: Tue, 25 Sep 2018 19:58:12 +0200 Subject: mobile, QML UI: ssrfButton and download controls resizable Make the ssrfButton and the pull down menu's on the download page resizable. Notice that also the contents of the pulldown menu's is scaled based on the font size. Signed-off-by: Jan Mulder --- mobile-widgets/qml/DownloadFromDiveComputer.qml | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) (limited to 'mobile-widgets/qml/DownloadFromDiveComputer.qml') diff --git a/mobile-widgets/qml/DownloadFromDiveComputer.qml b/mobile-widgets/qml/DownloadFromDiveComputer.qml index 9321d631e..74cb64195 100644 --- a/mobile-widgets/qml/DownloadFromDiveComputer.qml +++ b/mobile-widgets/qml/DownloadFromDiveComputer.qml @@ -55,14 +55,19 @@ Kirigami.Page { Layout.alignment: Qt.AlignTop Layout.topMargin: Kirigami.Units.smallSpacing * 4 columns: 2 - Controls.Label { text: qsTr(" Vendor name: ") } + Controls.Label { + text: qsTr(" Vendor name: ") + font.pointSize: subsurfaceTheme.regularPointSize + } Controls.ComboBox { id: comboVendor Layout.fillWidth: true + Layout.preferredHeight: fontMetrics.height * 2.5 model: vendorList currentIndex: -1 delegate: Controls.ItemDelegate { width: comboVendor.width + height: fontMetrics.height * 2.0 contentItem: Text { text: modelData font.pointSize: subsurfaceTheme.regularPointSize @@ -92,14 +97,19 @@ Kirigami.Page { } } } - Controls.Label { text: qsTr(" Dive Computer:") } + Controls.Label { + text: qsTr(" Dive Computer:") + font.pointSize: subsurfaceTheme.regularPointSize + } Controls.ComboBox { id: comboProduct Layout.fillWidth: true + Layout.preferredHeight: fontMetrics.height * 2.5 model: null currentIndex: -1 delegate: Controls.ItemDelegate { width: comboProduct.width + height: fontMetrics.height * 2.0 contentItem: Text { text: modelData font.pointSize: subsurfaceTheme.regularPointSize @@ -127,17 +137,21 @@ Kirigami.Page { currentIndex = manager.getDetectedProductIndex(comboVendor.currentText) } } - Controls.Label { text: qsTr(" Connection:") } + Controls.Label { + text: qsTr(" Connection:") + font.pointSize: subsurfaceTheme.regularPointSize + } Controls.ComboBox { id: comboConnection Layout.fillWidth: true + Layout.preferredHeight: fontMetrics.height * 2.5 model: connectionListModel currentIndex: -1 delegate: Controls.ItemDelegate { width: comboConnection.width + height: fontMetrics.height * 2.0 contentItem: Text { text: modelData - // color: "#21be2b" font.pointSize: subsurfaceTheme.smallPointSize verticalAlignment: Text.AlignVCenter elide: Text.ElideRight -- cgit v1.2.3-70-g09d2