root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-01-19 12:12:08 +01:00
Code Issues Projects Releases Activity

Added waypoint icons highlighting

Browse Source
This commit is contained in:
Martin Tůma 2021-10-24 14:31:31 +02:00
parent 7fe82b12fe
commit f810117cbe
1 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/GUI/waypointitem.cpp
View File

@ -104,6 +104,10 @@ void WaypointItem::updateCache()
_labelBB = fm.tightBoundingRect(_waypoint.name()); _labelBB = fm.tightBoundingRect(_waypoint.name());
if (_showIcon && _icon) { if (_showIcon && _icon) {
if (_font.bold())
p.addRect(-_icon->width() * 0.625, -_icon->height() * 1.25,
_icon->width() * 1.25, _icon->height() * 1.25);
else
p.addRect(-_icon->width()/2.0, -_icon->height(), _icon->width(), p.addRect(-_icon->width()/2.0, -_icon->height(), _icon->width(),
_icon->height()); _icon->height());
p.addRect(0, 0, _labelBB.width(), _labelBB.height() + fm.descent()); p.addRect(0, 0, _labelBB.width(), _labelBB.height() + fm.descent());
@ -113,10 +117,14 @@ void WaypointItem::updateCache()
_labelBB.height() + fm.descent()); _labelBB.height() + fm.descent());
} }
} else { } else {
if (_showIcon && _icon) if (_showIcon && _icon) {
if (_font.bold())
p.addRect(-_icon->width() * 0.625, -_icon->height() * 1.25,
_icon->width() * 1.25, _icon->height() * 1.25);
else
p.addRect(-_icon->width()/2, -_icon->height(), _icon->width(), p.addRect(-_icon->width()/2, -_icon->height(), _icon->width(),
_icon->height()); _icon->height());
else } else
p.addRect(-pointSize/2, -pointSize/2, pointSize, pointSize); p.addRect(-pointSize/2, -pointSize/2, pointSize, pointSize);
} }
@ -143,16 +151,19 @@ void WaypointItem::paint(QPainter *painter,
} }
painter->setBrush(QBrush(_color, Qt::SolidPattern)); painter->setBrush(QBrush(_color, Qt::SolidPattern));
if (_showIcon && _icon) if (_showIcon && _icon) {
painter->drawPixmap(-_icon->width()/2.0, -_icon->height(), *_icon); if (_font.bold())
painter->drawPixmap(-_icon->width() * 0.625, -_icon->height() * 1.25,
_icon->scaled(_icon->width() * 1.25, _icon->height() * 1.25,
Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
else else
painter->drawPixmap(-_icon->width()/2.0, -_icon->height(), *_icon);
} else
painter->drawEllipse(-pointSize/2, -pointSize/2, pointSize, pointSize); painter->drawEllipse(-pointSize/2, -pointSize/2, pointSize, pointSize);
/* //painter->setPen(Qt::red);
painter->setPen(Qt::red); //painter->setBrush(Qt::NoBrush);
painter->setBrush(Qt::NoBrush); //painter->drawPath(_shape);
painter->drawPath(_shape);
*/
} }
void WaypointItem::setSize(int size) void WaypointItem::setSize(int size)