From 6768647070d4446ef33dfb70ebdd16a9c8e88d9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Wed, 14 Sep 2022 00:21:50 +0200 Subject: [PATCH] Fixed broken zoom 0 on HiDPI displays --- src/map/onlinemap.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/map/onlinemap.cpp b/src/map/onlinemap.cpp index a88b0268..0d0e96cd 100644 --- a/src/map/onlinemap.cpp +++ b/src/map/onlinemap.cpp @@ -98,15 +98,17 @@ qreal OnlineMap::tileSize() const void OnlineMap::draw(QPainter *painter, const QRectF &rect, Flags flags) { qreal scale = OSM::zoom2scale(_zoom, _tileSize); + QRectF b(bounds()); QPoint tile = OSM::mercator2tile(QPointF(rect.topLeft().x() * scale, -rect.topLeft().y() * scale) * coordinatesRatio(), _zoom); QPointF tl(floor(rect.left() / tileSize()) * tileSize(), floor(rect.top() / tileSize()) * tileSize()); - QSizeF s(rect.right() - tl.x(), rect.bottom() - tl.y()); - int width = _zoom ? qCeil(s.width() / tileSize()) : 1; - int height = _zoom ? qCeil(s.height() / tileSize()) : 1; + QSizeF s(qMin(rect.right() - tl.x(), b.width()), + qMin(rect.bottom() - tl.y(), b.height())); + int width = ceil(s.width() / tileSize()); + int height = ceil(s.height() / tileSize()); QVector tiles; tiles.reserve(width * height); @@ -122,10 +124,9 @@ void OnlineMap::draw(QPainter *painter, const QRectF &rect, Flags flags) for (int i = 0; i < tiles.count(); i++) { FetchTile &t = tiles[i]; - QPointF tp = _zoom ? QPointF(tl.x() + (t.xy().x() - tile.x()) - * tileSize(), tl.y() + ((_invertY ? (1<<_zoom) - t.xy().y() - 1 : - t.xy().y()) - tile.y()) * tileSize()) - : QPointF(-_tileSize/2, -_tileSize/2); + QPointF tp(qMax(tl.x(), b.left()) + (t.xy().x() - tile.x()) * tileSize(), + qMax(tl.y(), b.top()) + ((_invertY ? (1<<_zoom) - t.xy().y() - 1 : + t.xy().y()) - tile.y()) * tileSize()); if (!t.pixmap().isNull()) { t.pixmap().setDevicePixelRatio(imageRatio());