diff options
| author | Paolo Angelelli <paolo.angelelli@qt.io> | 2017-03-09 14:42:38 +0100 |
|---|---|---|
| committer | Paolo Angelelli <paolo.angelelli@qt.io> | 2017-03-22 11:13:32 +0000 |
| commit | 53b8d29733d912ce25dd45a6ceb9d1f20c4a998a (patch) | |
| tree | ec4a6073d1bc1d21ab6fca0003608d888d1ec9fa /src/location/declarativemaps/qdeclarativegeomapquickitem_p.h | |
| parent | 5c7e6ead198af76022df2bc9ecfb88e727b26bc5 (diff) | |
Fix for disappearing MapQuickItems with tilted camera
This patch fixes a bug that makes MapQuickItem disappear when
the zoomLevel property is set, the camera is tilted and zoomed in
very close to the item, causing the coordinate of the map quick item
to end behind the camera.
Task-number: QTBUG-59397
Change-Id: Iae92204917729eb9daaf8592db318613bf57b966
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'src/location/declarativemaps/qdeclarativegeomapquickitem_p.h')
| -rw-r--r-- | src/location/declarativemaps/qdeclarativegeomapquickitem_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/location/declarativemaps/qdeclarativegeomapquickitem_p.h b/src/location/declarativemaps/qdeclarativegeomapquickitem_p.h index cce94d85..2035a997 100644 --- a/src/location/declarativemaps/qdeclarativegeomapquickitem_p.h +++ b/src/location/declarativemaps/qdeclarativegeomapquickitem_p.h @@ -108,6 +108,7 @@ Q_SIGNALS: protected: void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE; void updatePolish() Q_DECL_OVERRIDE; + bool childMouseEventFilter(QQuickItem *item, QEvent *event) Q_DECL_OVERRIDE; protected Q_SLOTS: virtual void afterChildrenChanged() Q_DECL_OVERRIDE; @@ -115,6 +116,7 @@ protected Q_SLOTS: private: qreal scaleFactor(); + QGeoCoordinate dragStartCoordinate_; QGeoCoordinate coordinate_; QGeoRectangle geoshape_; QPointer<QQuickItem> sourceItem_; |