From cc3a5a926db8d07c8282407a7b010b4ab2289592 Mon Sep 17 00:00:00 2001 From: Paolo Angelelli Date: Mon, 12 Feb 2018 13:10:02 +0100 Subject: Fix zoomLevel being emitted when the value has not changed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Map.setZoomLevel currently clamps the user-set value to a valid range. The current implementation emits zoomLevelChanged every time the user-set value is different from the current value. This patch restrict emission to when the actual value has really changed. Change-Id: I2096b666d2a5b1849c9022cad028b826cfee2a78 Reviewed-by: Jan Arve Sæther --- src/location/declarativemaps/qdeclarativegeomap.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/location/declarativemaps/qdeclarativegeomap.cpp') diff --git a/src/location/declarativemaps/qdeclarativegeomap.cpp b/src/location/declarativemaps/qdeclarativegeomap.cpp index d7f93d14..fefffeb6 100644 --- a/src/location/declarativemaps/qdeclarativegeomap.cpp +++ b/src/location/declarativemaps/qdeclarativegeomap.cpp @@ -916,7 +916,8 @@ void QDeclarativeGeoMap::setZoomLevel(qreal zoomLevel) */ void QDeclarativeGeoMap::setZoomLevel(qreal zoomLevel, bool overzoom) { - if (m_cameraData.zoomLevel() == zoomLevel || zoomLevel < 0) + const qreal oldZoom = m_cameraData.zoomLevel(); + if (oldZoom == zoomLevel || zoomLevel < 0) return; //small optimization to avoid double setCameraData @@ -940,7 +941,8 @@ void QDeclarativeGeoMap::setZoomLevel(qreal zoomLevel, bool overzoom) if (centerHasChanged) emit centerChanged(m_cameraData.center()); - emit zoomLevelChanged(m_cameraData.zoomLevel()); + if (oldZoom != m_cameraData.zoomLevel()) + emit zoomLevelChanged(m_cameraData.zoomLevel()); } qreal QDeclarativeGeoMap::zoomLevel() const -- cgit v1.2.1