diff options
| author |  Jan Mulder <jlmulder@xs4all.nl> | 2018-09-25 19:58:12 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-09-26 08:38:53 -0700 |
| commit | be1d3a7986a8edc5f72ee7efdba5ec4618cd8870 (patch) | |
| tree | 53518d1fb9a66ebcbd39dfab34f8439e29219636 | |
| parent | f6ee900826b9f5c81382cd961cfe3e6bee4d9bdb (diff) | |
| download | subsurface-be1d3a7986a8edc5f72ee7efdba5ec4618cd8870.tar.gz | |
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 <jlmulder@xs4all.nl>
| -rw-r--r-- | mobile-widgets/qml/DownloadFromDiveComputer.qml | 22 | ||||
| -rw-r--r-- | mobile-widgets/qml/SsrfButton.qml | 1 |
2 files changed, 19 insertions, 4 deletions
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 diff --git a/mobile-widgets/qml/SsrfButton.qml b/mobile-widgets/qml/SsrfButton.qml index c9441995e..3f57ea6e0 100644 --- a/mobile-widgets/qml/SsrfButton.qml +++ b/mobile-widgets/qml/SsrfButton.qml @@ -15,6 +15,7 @@ Button { contentItem: Text { id: buttonText text: root.text + font.pointSize: subsurfaceTheme.regularPointSize anchors.centerIn: buttonBackground color: root.pressed ? subsurfaceTheme.darkerPrimaryTextColor :subsurfaceTheme.primaryTextColor } |