diff options
| author | Paolo Angelelli <paolo.angelelli@qt.io> | 2018-01-09 15:43:36 +0100 |
|---|---|---|
| committer | Paolo Angelelli <paolo.angelelli@qt.io> | 2018-01-11 12:47:43 +0000 |
| commit | 444e178a0779f1b0d28e2de1d4dc6a4b228c7a5d (patch) | |
| tree | 257f3f9f7958ee6945b5972cde67976961b17551 /src/location/declarativemaps/qdeclarativegeomapquickitem_p.h | |
| parent | 8825b9f97612442b645cc4dc428cb2c80349abbe (diff) | |
| download | qtlocation-444e178a0779f1b0d28e2de1d4dc6a4b228c7a5d.tar.gz | |
Fix fitViewportToMapItems in presence of MapQuickItems with zoomLevel
Map.fitViewportToMapItems currently uses the screen geometries of the
items to calculate the new values for zoom level and center.
When the zoomLevel property is set on MapQuickItems, their on-screen
geometry is affected by a hidden transformation within the item.
This patch considers that transformation in the calculations.
Task-number: QTBUG-63093
Change-Id: I328028f1901b31225866aa3d749849815d59a2a1
Reviewed-by: Vlad Seryakov <vseryakov@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
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 2035a997..f6b2c7b1 100644 --- a/src/location/declarativemaps/qdeclarativegeomapquickitem_p.h +++ b/src/location/declarativemaps/qdeclarativegeomapquickitem_p.h @@ -126,6 +126,8 @@ private: bool mapAndSourceItemSet_; bool updatingGeometry_; QMapQuickItemMatrix4x4 *matrix_; + + friend class QDeclarativeGeoMap; }; QT_END_NAMESPACE |