From 1d01fff0061bde6260259a9a2b46f80a31ad1218 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Sat, 31 Aug 2019 23:24:21 +0200 Subject: Map: export isSelected as attribute from MapLocationModel Recently we changed the MapLocationModel-items to store whether they are selected. Thus, we can directly export an isSelected flag instead of calling a function taking a dive-site argument. 1) This makes the QML easier to read. 2) This avoids passing pointers through QML which has caused us lots of pain. Signed-off-by: Berthold Stoeger --- map-widget/qml/MapWidget.qml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'map-widget') diff --git a/map-widget/qml/MapWidget.qml b/map-widget/qml/MapWidget.qml index 8116163cf..a71ade59c 100644 --- a/map-widget/qml/MapWidget.qml +++ b/map-widget/qml/MapWidget.qml @@ -66,7 +66,7 @@ Item { PropertyAnimation { target: mapItemImage; property: "scale"; from: 0.7; to: 1.0; duration: 80 } } MouseArea { - drag.target: (mapHelper.editMode && mapHelper.model.isSelected(model.divesite)) ? mapItem : undefined + drag.target: (mapHelper.editMode && model.isSelected) ? mapItem : undefined anchors.fill: parent onClicked: { if (!mapHelper.editMode && model.divesite) @@ -74,7 +74,7 @@ Item { } onDoubleClicked: map.doubleClickHandler(mapItem.coordinate) onReleased: { - if (mapHelper.editMode && mapHelper.model.isSelected(model.divesite)) { + if (mapHelper.editMode && model.isSelected) { mapHelper.updateCurrentDiveSiteCoordinatesFromMap(model.divesite, mapItem.coordinate) } } @@ -94,7 +94,7 @@ Item { id: mapItemText text: model.name font.pointSize: 11.0 - color: mapHelper.model.isSelected(model.divesite) ? "white" : "lightgrey" + color: model.isSelected ? "white" : "lightgrey" } } } -- cgit v1.2.3-70-g09d2