diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2018-06-25 16:41:29 +0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2018-06-26 03:56:44 +0800 |
| commit | f998b59900c0d66441fa9877930754daf084aea9 (patch) | |
| tree | 332025d34ed62fe9d95da6b4b9ca6c065b505def /mobile-widgets | |
| parent | cda1961d80878add50baf34b8c4e7be0ce271403 (diff) | |
| download | subsurface-f998b59900c0d66441fa9877930754daf084aea9.tar.gz | |
QML UI: don't use anchors within Layouts
Qt 5.11 adds useful warnings when code attempts to use anchors within
Layouts and even tells you how to fix things.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'mobile-widgets')
| -rw-r--r-- | mobile-widgets/qml/CloudCredentials.qml | 10 | ||||
| -rw-r--r-- | mobile-widgets/qml/DownloadFromDiveComputer.qml | 24 |
2 files changed, 10 insertions, 24 deletions
diff --git a/mobile-widgets/qml/CloudCredentials.qml b/mobile-widgets/qml/CloudCredentials.qml index dd03c4d69..f148e9922 100644 --- a/mobile-widgets/qml/CloudCredentials.qml +++ b/mobile-widgets/qml/CloudCredentials.qml @@ -97,9 +97,8 @@ Item { } RowLayout { - anchors.left: parent.left - anchors.right: parent.right - anchors.margins: Kirigami.Units.smallSpacing + Layout.fillWidth: true + Layout.margins: Kirigami.Units.smallSpacing spacing: Kirigami.Units.smallSpacing visible: rootItem.showPin SsrfButton { @@ -124,9 +123,8 @@ Item { } RowLayout { - anchors.left: parent.left - anchors.right: parent.right - anchors.margins: Kirigami.Units.smallSpacing + Layout.fillWidth: true + Layout.margins: Kirigami.Units.smallSpacing spacing: Kirigami.Units.smallSpacing visible: !rootItem.showPin diff --git a/mobile-widgets/qml/DownloadFromDiveComputer.qml b/mobile-widgets/qml/DownloadFromDiveComputer.qml index 3da83e5c8..1182a9d37 100644 --- a/mobile-widgets/qml/DownloadFromDiveComputer.qml +++ b/mobile-widgets/qml/DownloadFromDiveComputer.qml @@ -49,10 +49,8 @@ Kirigami.Page { Layout.fillWidth: true GridLayout { id: buttonGrid - anchors { - top: parent.top - topMargin: Kirigami.Units.smallSpacing * 4 - } + Layout.alignment: Qt.AlignTop + Layout.topMargin: Kirigami.Units.smallSpacing * 4 columns: 2 Controls.Label { text: qsTr(" Vendor name: ") } Controls.ComboBox { @@ -163,11 +161,8 @@ Kirigami.Page { } Controls.ProgressBar { - anchors { - top: buttonGrid.bottom - topMargin: Kirigami.Units.smallSpacing * 4 - } id: progressBar + Layout.topMargin: Kirigami.Units.smallSpacing * 4 Layout.fillWidth: true indeterminate: true visible: false @@ -175,12 +170,8 @@ Kirigami.Page { RowLayout { id: buttonBar - anchors { - left: parent.left - right: parent.right - top: progressBar.bottom - topMargin: Kirigami.Units.smallSpacing * 2 - } + Layout.fillWidth: true + Layout.topMargin: Kirigami.Units.smallSpacing * 2 spacing: Kirigami.Units.smallSpacing SsrfButton { id: download @@ -227,10 +218,7 @@ Kirigami.Page { ListView { id: dlList - anchors { - top: buttonBar.bottom - topMargin: Kirigami.Units.smallSpacing * 4 - } + Layout.topMargin: Kirigami.Units.smallSpacing * 4 Layout.bottomMargin: bottomButtons.height * 1.5 Layout.fillWidth: true Layout.fillHeight: true |