summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKimmo Leppälä <kimmo.leppala@theqtcompany.com>2015-02-25 09:27:59 +0200
committerAlex Blasche <alexander.blasche@theqtcompany.com>2015-03-26 12:10:17 +0000
commitb13fec3c7ed08b7d0e79c08312a3c3285eb20ef3 (patch)
treed7ee8720e86ac95891fb1a97584d914e45ae4c42
parent5421a141819e4954970aa9c16201a10ed09c8503 (diff)
downloadqtlocation-b13fec3c7ed08b7d0e79c08312a3c3285eb20ef3.tar.gz
Add changed signals for maximum and minimum zoom level setting
Signals minimumZoomLevelChanged and maximumZoomLevelChanged were only emitted in initialization but not after setting new values for max/min zoom level. Change-Id: Ibae0b31df7d36af061fddf70b2bf144fdb8276f9 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
-rw-r--r--src/imports/location/qdeclarativegeomap.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/imports/location/qdeclarativegeomap.cpp b/src/imports/location/qdeclarativegeomap.cpp
index 4fef83e6..4bfc8aff 100644
--- a/src/imports/location/qdeclarativegeomap.cpp
+++ b/src/imports/location/qdeclarativegeomap.cpp
@@ -539,12 +539,15 @@ QDeclarativeGeoServiceProvider *QDeclarativeGeoMap::plugin() const
void QDeclarativeGeoMap::setMinimumZoomLevel(qreal minimumZoomLevel)
{
if (gestureArea_ && minimumZoomLevel >= 0) {
+ qreal oldMinimumZoomLevel = this->minimumZoomLevel();
if (mappingManagerInitialized_
&& minimumZoomLevel < mappingManager_->cameraCapabilities().minimumZoomLevel()) {
minimumZoomLevel = mappingManager_->cameraCapabilities().minimumZoomLevel();
}
gestureArea_->setMinimumZoomLevel(minimumZoomLevel);
setZoomLevel(qBound<qreal>(minimumZoomLevel, zoomLevel(), maximumZoomLevel()));
+ if (oldMinimumZoomLevel != minimumZoomLevel)
+ emit minimumZoomLevelChanged();
}
}
@@ -575,12 +578,15 @@ qreal QDeclarativeGeoMap::minimumZoomLevel() const
void QDeclarativeGeoMap::setMaximumZoomLevel(qreal maximumZoomLevel)
{
if (gestureArea_ && maximumZoomLevel >= 0) {
+ qreal oldMaximumZoomLevel = this->maximumZoomLevel();
if (mappingManagerInitialized_
&& maximumZoomLevel > mappingManager_->cameraCapabilities().maximumZoomLevel()) {
maximumZoomLevel = mappingManager_->cameraCapabilities().maximumZoomLevel();
}
gestureArea_->setMaximumZoomLevel(maximumZoomLevel);
setZoomLevel(qBound<qreal>(minimumZoomLevel(), zoomLevel(), maximumZoomLevel));
+ if (oldMaximumZoomLevel != maximumZoomLevel)
+ emit maximumZoomLevelChanged();
}
}