root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-11-28 05:34:47 +01:00
Code Issues Projects Releases Activity

Fixed broken zoom handling

Browse Source
This commit is contained in:
Martin Tůma 2017-12-01 19:54:04 +01:00
parent 00acd48009
commit 56d1ac7ff2
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/GUI/mapview.cpp
View File

@ -203,18 +203,23 @@ void MapView::updateWaypointsBoundingRect(const Coordinates &wp)
qreal MapView::mapZoom() const qreal MapView::mapZoom() const
{ {
RectC br = _tr | _rr | _wr; RectC br;
return _map->zoomFit(viewport()->size() - QSize(2*MARGIN, 2*MARGIN), if (_tracks.isEmpty() && _routes.isEmpty() && _waypoints.isEmpty())
br.isValid() ? br : RectC(_map->xy2ll(sceneRect().topLeft()), br = RectC(_map->xy2ll(sceneRect().topLeft()),
_map->xy2ll(sceneRect().bottomRight()))); _map->xy2ll(sceneRect().bottomRight()));
else
br = _tr | _rr | _wr;
return _map->zoomFit(viewport()->size() - QSize(2*MARGIN, 2*MARGIN), br);
} }
QPointF MapView::contentCenter() const QPointF MapView::contentCenter() const
{ {
RectC br = _tr | _rr | _wr; if (_tracks.isEmpty() && _routes.isEmpty() && _waypoints.isEmpty())
return sceneRect().center();
return br.isValid() ? _map->ll2xy(br.center()) : sceneRect().center(); else
return _map->ll2xy((_tr | _rr | _wr).center());
} }
void MapView::updatePOIVisibility() void MapView::updatePOIVisibility()