mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

mobile/profile: directly set up the diveId

Browse source 
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>
This commit is contained in:
Dirk Hohndel 2020-12-21 04:38:48 -08:00
parent f8b354d64d
commit 1228dec19f
2 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
mobile-widgets/qml/DiveDetails.qml
View file

@ -411,6 +411,7 @@ Kirigami.Page {
DiveDetailsView { DiveDetailsView {
id: diveDetails id: diveDetails
width: internalScrollView.width width: internalScrollView.width
myId: model.id
} }
ScrollBar.vertical: ScrollBar { } ScrollBar.vertical: ScrollBar { }
} }

7
mobile-widgets/qml/DiveDetailsView.qml
View file

@ -12,6 +12,7 @@ Item {
property real col1Width: gridWidth * 0.40 property real col1Width: gridWidth * 0.40
property real col2Width: gridWidth * 0.30 property real col2Width: gridWidth * 0.30
property real col3Width: gridWidth * 0.30 property real col3Width: gridWidth * 0.30
property int myId: -1
width: diveDetailsPage.width - diveDetailsPage.leftPadding - diveDetailsPage.rightPadding width: diveDetailsPage.width - diveDetailsPage.leftPadding - diveDetailsPage.rightPadding
height: divePlate.implicitHeight + bottomLayout.implicitHeight + Kirigami.Units.iconSizes.large height: divePlate.implicitHeight + bottomLayout.implicitHeight + Kirigami.Units.iconSizes.large
@ -229,6 +230,7 @@ Item {
anchors.fill: parent anchors.fill: parent
clip: true clip: true
property real lastScale: 1.0 // final scale at the end of previous pinch property real lastScale: 1.0 // final scale at the end of previous pinch
diveId: detailsView.myId
Rectangle { Rectangle {
color: "transparent" color: "transparent"
opacity: 0.6 opacity: 0.6
@ -573,10 +575,5 @@ Item {
Layout.fillWidth: true Layout.fillWidth: true
Layout.minimumHeight: Kirigami.Units.gridUnit * 6 Layout.minimumHeight: Kirigami.Units.gridUnit * 6
} }
Component.onCompleted: {
qmlProfile.setMargin(Kirigami.Units.smallSpacing)
qmlProfile.diveId = model.id;
qmlProfile.update();
}
} }
} }