diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2020-12-21 04:38:48 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2020-12-21 13:12:37 -0800 |
| commit | 1228dec19f7d26886498d6a0dd0e7e1cc543c611 (patch) | |
| tree | b660b46e23c85ba5dae3a9e5aeae4a0b016d217c /mobile-widgets | |
| parent | f8b354d64d4f94a8b5a96b36c280354764250702 (diff) | |
| download | subsurface-1228dec19f7d26886498d6a0dd0e7e1cc543c611.tar.gz | |
mobile/profile: directly set up the diveId
The weird 'Component.onCompleted' always felt like the wrong way to do
this. Setting this directly from the model seems like the much cleaner
solution.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'mobile-widgets')
| -rw-r--r-- | mobile-widgets/qml/DiveDetails.qml | 1 | ||||
| -rw-r--r-- | mobile-widgets/qml/DiveDetailsView.qml | 7 |
2 files changed, 3 insertions, 5 deletions
diff --git a/mobile-widgets/qml/DiveDetails.qml b/mobile-widgets/qml/DiveDetails.qml index a71b85d12..71fad0a65 100644 --- a/mobile-widgets/qml/DiveDetails.qml +++ b/mobile-widgets/qml/DiveDetails.qml @@ -411,6 +411,7 @@ Kirigami.Page { DiveDetailsView { id: diveDetails width: internalScrollView.width + myId: model.id } ScrollBar.vertical: ScrollBar { } } diff --git a/mobile-widgets/qml/DiveDetailsView.qml b/mobile-widgets/qml/DiveDetailsView.qml index bd6fbbd89..b5aeb0249 100644 --- a/mobile-widgets/qml/DiveDetailsView.qml +++ b/mobile-widgets/qml/DiveDetailsView.qml @@ -12,6 +12,7 @@ Item { property real col1Width: gridWidth * 0.40 property real col2Width: gridWidth * 0.30 property real col3Width: gridWidth * 0.30 + property int myId: -1 width: diveDetailsPage.width - diveDetailsPage.leftPadding - diveDetailsPage.rightPadding height: divePlate.implicitHeight + bottomLayout.implicitHeight + Kirigami.Units.iconSizes.large @@ -229,6 +230,7 @@ Item { anchors.fill: parent clip: true property real lastScale: 1.0 // final scale at the end of previous pinch + diveId: detailsView.myId Rectangle { color: "transparent" opacity: 0.6 @@ -573,10 +575,5 @@ Item { Layout.fillWidth: true Layout.minimumHeight: Kirigami.Units.gridUnit * 6 } - Component.onCompleted: { - qmlProfile.setMargin(Kirigami.Units.smallSpacing) - qmlProfile.diveId = model.id; - qmlProfile.update(); - } } } |