root/QtPBFImagePlugin
1
0
Fork 0
mirror of https://github.com/tumic0/QtPBFImagePlugin.git synced 2025-07-29 10:14:24 +02:00
Code Issues Projects Releases Wiki Activity

Properly scale the whole tile content

Browse Source
This commit is contained in:
Martin Tůma
2018-11-17 21:54:51 +01:00
parent 14adb0925c
commit 1f9e044493
8 changed files with 25 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/text.cpp
View File

@ -157,12 +157,7 @@ void Text::addLabel(const QString &text, const QPointF &pos,
TextPointItem *ti;
if (_fontScale != 1.0) {
QFont scaledFont(painter.font());
scaledFont.setPixelSize(painter.font().pixelSize() * _fontScale);
ti = new TextPointItem(text, pos, scaledFont, maxTextWidth);
} else
ti = new TextPointItem(text, pos, painter.font(), maxTextWidth);
ti = new TextPointItem(text, pos, painter.font(), maxTextWidth);
ti->setPen(painter.pen());
addItem(ti);
@ -179,20 +174,17 @@ void Text::addLabel(const QString &text, const QPainterPath &path,
if (text.isEmpty())
return;
QFont scaledFont(painter.font());
scaledFont.setPixelSize(painter.font().pixelSize() * _fontScale);
int textWidth = text.size() * scaledFont.pixelSize() * 0.6;
int textWidth = text.size() * painter.font().pixelSize() * 0.6;
if (textWidth > path.length())
return;
QPainterPath tp(textPath(path, textWidth, maxAngle,
scaledFont.pixelSize() / 2, _sceneRect));
painter.font().pixelSize() / 2, _sceneRect));
if (tp.isEmpty())
return;
TextPathItem *pi = new TextPathItem(text, reverse(tp) ? tp.toReversed()
: tp, scaledFont);
: tp, painter.font());
if (!_sceneRect.contains(pi->boundingRect())) {
delete pi;
return;