39 lines
1.9 KiB
Diff
39 lines
1.9 KiB
Diff
diff -up qtbase-everywhere-src-5.11.2/src/gui/text/qtextlayout.cpp.me qtbase-everywhere-src-5.11.2/src/gui/text/qtextlayout.cpp
|
|
--- qtbase-everywhere-src-5.11.2/src/gui/text/qtextlayout.cpp.me 2018-10-25 10:54:48.849646288 +0200
|
|
+++ qtbase-everywhere-src-5.11.2/src/gui/text/qtextlayout.cpp 2018-10-25 10:58:19.054347658 +0200
|
|
@@ -1006,10 +1006,8 @@ static void addSelectedRegionsToPath(QTe
|
|
}
|
|
|
|
if (lastSelectionWidth > 0) {
|
|
- QRectF rect = boundingRect & QRectF(lastSelectionX.toReal(), selectionY, lastSelectionWidth.toReal(), lineHeight);
|
|
- rect.moveLeft(qFloor(rect.left()));
|
|
- rect.moveTop(qFloor(rect.top()));
|
|
- region->addRect(rect);
|
|
+ const QRectF rect = boundingRect & QRectF(lastSelectionX.toReal(), selectionY, lastSelectionWidth.toReal(), lineHeight);
|
|
+ region->addRect(rect.toAlignedRect());
|
|
}
|
|
|
|
lastSelectionX = selectionX;
|
|
@@ -1017,10 +1015,8 @@ static void addSelectedRegionsToPath(QTe
|
|
}
|
|
}
|
|
if (lastSelectionWidth > 0) {
|
|
- QRectF rect = boundingRect & QRectF(lastSelectionX.toReal(), selectionY, lastSelectionWidth.toReal(), lineHeight);
|
|
- rect.moveLeft(qFloor(rect.left()));
|
|
- rect.moveTop(qFloor(rect.top()));
|
|
- region->addRect(rect);
|
|
+ const QRectF rect = boundingRect & QRectF(lastSelectionX.toReal(), selectionY, lastSelectionWidth.toReal(), lineHeight);
|
|
+ region->addRect(rect.toAlignedRect());
|
|
}
|
|
}
|
|
|
|
@@ -2135,7 +2131,7 @@ static void setPenAndDrawBackground(QPai
|
|
|
|
QBrush bg = chf.background();
|
|
if (bg.style() != Qt::NoBrush && !chf.property(SuppressBackground).toBool())
|
|
- p->fillRect(QRectF(qFloor(r.x()), qFloor(r.y()), r.width(), r.height()), bg);
|
|
+ p->fillRect(r.toAlignedRect(), bg);
|
|
if (c.style() != Qt::NoBrush) {
|
|
p->setPen(QPen(c, 0));
|
|
}
|