root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-06-28 12:09:15 +02:00
Code Issues Projects Releases Activity

Improved mapsforge hi-dpi rendering

Browse Source
This commit is contained in:
Martin Tůma
2021-04-18 12:20:07 +02:00
parent b6add991d2
commit 663859ef1c
11 changed files with 114 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/map/IMG/rastertile.cpp
View File

@ -13,6 +13,8 @@ using namespace IMG;
#define AREA(rect) \
(rect.size().width() * rect.size().height())
static const QColor textColor(Qt::black);
static const QColor haloColor(Qt::white);
static const QColor shieldColor(Qt::white);
static const QColor shieldBgColor1("#dd3e3e");
static const QColor shieldBgColor2("#379947");
@ -316,8 +318,8 @@ void RasterTile::processPolygons(QList<TextItem*> &textItems)
|| Style::isNatureReserve(poly.type))) {
const Style::Polygon &style = _style->polygon(poly.type);
TextPointItem *item = new TextPointItem(
centroid(poly.points).toPoint(), &poly.label.text(),
poiFont(), 0, &style.brush().color());
centroid(poly.points).toPoint(), &poly.label.text(), poiFont(),
0, &style.brush().color(), &haloColor);
if (item->isValid() && !item->collides(textItems)
&& !item->collides(labels)
&& !(exists && tileRect.contains(item->boundingRect()))
@ -417,7 +419,7 @@ void RasterTile::processShields(const QRect &tileRect,
TextPointItem *item = new TextPointItem(
p.at(jt.value()).toPoint(), &(sp.value(it.key())->text()),
poiFont(), 0, &shieldColor, shieldBgColor(it.key().type()));
poiFont(), 0, &shieldColor, 0, shieldBgColor(it.key().type()));
bool valid = false;
while (true) {
@ -457,7 +459,7 @@ void RasterTile::processPoints(QList<TextItem*> &textItems)
const QFont *fnt = poi
? poiFont(style.textFontSize()) : font(style.textFontSize());
const QColor *color = style.textColor().isValid()
? &style.textColor() : 0;
? &style.textColor() : &textColor;
if ((!label || !fnt) && !img)
continue;
@ -471,7 +473,7 @@ void RasterTile::processPoints(QList<TextItem*> &textItems)
}
TextPointItem *item = new TextPointItem(QPoint(point.coordinates.lon(),
point.coordinates.lat()), label, fnt, img, color);
point.coordinates.lat()), label, fnt, img, color, &haloColor);
if (item->isValid() && !item->collides(textItems))
textItems.append(item);
else