From 12004dfa1d5040a38f26e4170eb43347e06c2ac8 Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Mon, 14 Nov 2022 20:23:11 +0100 Subject: Get Map.minimum/maximumZoomLevel from camera rather than gesture area The gesture area will eventually be eliminated; but PinchHandler needs to have minimum/maximumScale set, so it's not useful to ever have those values being NaN. Pick-to: 6.5 Change-Id: Ib69de2370038711a0704f870e005be3b83f9655c Reviewed-by: Volker Hilsheimer --- src/location/quickmapitems/qdeclarativegeomap.cpp | 25 ++++++----------------- src/location/quickmapitems/qdeclarativegeomap_p.h | 2 -- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/src/location/quickmapitems/qdeclarativegeomap.cpp b/src/location/quickmapitems/qdeclarativegeomap.cpp index 5abbfd3b..97d3261c 100644 --- a/src/location/quickmapitems/qdeclarativegeomap.cpp +++ b/src/location/quickmapitems/qdeclarativegeomap.cpp @@ -726,23 +726,7 @@ qreal QDeclarativeGeoMap::minimumZoomLevel() const if (!qIsNaN(m_userMinimumZoomLevel)) return m_userMinimumZoomLevel; else - return m_gestureArea->minimumZoomLevel(); -} - -/*! - \internal -*/ -qreal QDeclarativeGeoMap::implicitMinimumZoomLevel() const -{ - return m_gestureArea->minimumZoomLevel(); -} - -/*! - \internal -*/ -qreal QDeclarativeGeoMap::effectiveMinimumZoomLevel() const -{ - return qMax(minimumZoomLevel(), implicitMinimumZoomLevel()); + return m_cameraCapabilities.minimumZoomLevel(); } /*! @@ -780,7 +764,10 @@ void QDeclarativeGeoMap::setMaximumZoomLevel(qreal maximumZoomLevel, bool userSe qreal QDeclarativeGeoMap::maximumZoomLevel() const { - return m_gestureArea->maximumZoomLevel(); + if (!qIsNaN(m_userMaximumZoomLevel)) + return m_userMaximumZoomLevel; + else + return m_cameraCapabilities.maximumZoomLevel(); } /*! @@ -818,7 +805,7 @@ void QDeclarativeGeoMap::setZoomLevel(qreal zoomLevel, bool overzoom) if (cameraData.zoomLevel() == zoomLevel) return; - cameraData.setZoomLevel(qBound(overzoom ? m_map->minimumZoom() : effectiveMinimumZoomLevel(), + cameraData.setZoomLevel(qBound(overzoom ? m_map->minimumZoom() : m_cameraCapabilities.minimumZoomLevel(), zoomLevel, overzoom ? 30 : maximumZoomLevel())); m_maximumViewportLatitude = m_map->maximumCenterLatitudeAtZoom(cameraData); diff --git a/src/location/quickmapitems/qdeclarativegeomap_p.h b/src/location/quickmapitems/qdeclarativegeomap_p.h index 233dd07a..837e976b 100644 --- a/src/location/quickmapitems/qdeclarativegeomap_p.h +++ b/src/location/quickmapitems/qdeclarativegeomap_p.h @@ -122,8 +122,6 @@ public: void setMinimumZoomLevel(qreal minimumZoomLevel, bool userSet = true); qreal minimumZoomLevel() const; - qreal implicitMinimumZoomLevel() const; - qreal effectiveMinimumZoomLevel() const; void setMaximumZoomLevel(qreal maximumZoomLevel, bool userSet = true); qreal maximumZoomLevel() const; -- cgit v1.2.1