Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Try to fix pinching gesture when a finger starts on a bookmark marker #5403

Closed
wants to merge 1 commit into from
Closed

Try to fix pinching gesture when a finger starts on a bookmark marker #5403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/qml/BookmarkHighlight.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,16 @@ import Theme 1.0

Repeater {
id: bookmarkHighlight

property bool interactive: true
property MapSettings mapSettings

model: qfieldSettings.showBookmarks ? bookmarkModel : undefined

delegate: BookmarkRenderer {
id: bookmarkRenderer

interactive: bookmarkHighlight.interactive
mapSettings: bookmarkHighlight.mapSettings
geometryWrapper.qgsGeometry: model.BookmarkPoint
geometryWrapper.crs: model.BookmarkCrs
Expand Down
3 changes: 3 additions & 0 deletions src/qml/BookmarkRenderer.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ import Theme 1.0
Item {
id: bookmarkRenderer

property bool interactive: true

property var bookmarkIndex: undefined
property string bookmarkId: ''
property string bookmarkName: ''
Expand Down Expand Up @@ -124,6 +126,7 @@ Item {
}

MouseArea {
enabled: bookmarkRenderer.interactive
anchors.fill: bookmark
onClicked: {
displayToast(qsTr('Bookmark: %1').arg(bookmarkRenderer.bookmarkName));
Expand Down
1 change: 1 addition & 0 deletions src/qml/MapCanvas.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ Item {

property bool interactive: true
property bool hovered: false
property bool dragged: mainDragHandler.active || stylusDragHandler
property bool pinched: pinchHandler.active
property bool freehandDigitizing: false
property bool isMapRotationEnabled: false
Expand Down
1 change: 1 addition & 0 deletions src/qml/qgismobileapp.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -713,6 +713,7 @@ ApplicationWindow {

BookmarkHighlight {
id: bookmarkHighlight
interactive: !mapCanvasMap.dragged
mapSettings: mapCanvas.mapSettings
}

Expand Down
Loading