AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix misaligned selection region with text when centered

Browse Source 
If the text is centered, the x/y position in the selection QRectF may
be a multiple of 0.5 which is rounded up. This rounding causes
misalignment of the selection region with the text.

The alignment is fixed by using qFloor on the x and y components.

Task-number: QTBUG-34218
Task-number: QTBUG-34234
Change-Id: I4f2fadeb38602f62a93773c6e5faecf03b28069f
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
This commit is contained in:
Jonathan Liu 2013-10-23 00:28:17 +11:00 committed by The Qt Project
parent aa7fa09312
commit 5d8a882c11
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/gui/text/qtextlayout.cpp
View File

@ -44,6 +44,7 @@
#include <qthread.h> #include <qthread.h>
#include <qfont.h> #include <qfont.h>
#include <qmath.h>
#include <qpainter.h> #include <qpainter.h>
#include <qvarlengtharray.h> #include <qvarlengtharray.h>
#include <qtextformat.h> #include <qtextformat.h>
@ -946,15 +947,23 @@ static void addSelectedRegionsToPath(QTextEngine *eng, int lineNumber, const QPo
continue; continue;
} }
if (lastSelectionWidth > 0) if (lastSelectionWidth > 0) {
region->addRect(boundingRect & QRectF(lastSelectionX.toReal(), selectionY, lastSelectionWidth.toReal(), lineHeight)); QRectF rect = boundingRect & QRectF(lastSelectionX.toReal(), selectionY, lastSelectionWidth.toReal(), lineHeight);
rect.moveLeft(qFloor(rect.left()));
rect.moveTop(qFloor(rect.top()));
region->addRect(rect);
}
lastSelectionX = selectionX; lastSelectionX = selectionX;
lastSelectionWidth = selectionWidth; lastSelectionWidth = selectionWidth;
} }
} }
if (lastSelectionWidth > 0) if (lastSelectionWidth > 0) {
region->addRect(boundingRect & QRectF(lastSelectionX.toReal(), selectionY, lastSelectionWidth.toReal(), lineHeight)); QRectF rect = boundingRect & QRectF(lastSelectionX.toReal(), selectionY, lastSelectionWidth.toReal(), lineHeight);
rect.moveLeft(qFloor(rect.left()));
rect.moveTop(qFloor(rect.top()));
region->addRect(rect);
}
} }
static inline QRectF clipIfValid(const QRectF &rect, const QRectF &clip) static inline QRectF clipIfValid(const QRectF &rect, const QRectF &clip)
@ -2077,7 +2086,7 @@ static void setPenAndDrawBackground(QPainter *p, const QPen &defaultPen, const Q
QBrush bg = chf.background(); QBrush bg = chf.background();
if (bg.style() != Qt::NoBrush && !chf.property(SuppressBackground).toBool()) if (bg.style() != Qt::NoBrush && !chf.property(SuppressBackground).toBool())
p->fillRect(r, bg); p->fillRect(QRectF(qFloor(r.x()), qFloor(r.y()), r.width(), r.height()), bg);
if (c.style() != Qt::NoBrush) { if (c.style() != Qt::NoBrush) {
p->setPen(QPen(c, 0)); p->setPen(QPen(c, 0));
} }