qtbase: add upstream QTBUG-34218/QTBUG-34234 misaligned selection patch
Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
parent
84cd4be249
commit
c36be1724a
|
@ -0,0 +1,74 @@
|
|||
From 5d8a882c11201a29475c5ea71cfb76c9de6573f5 Mon Sep 17 00:00:00 2001
|
||||
From: Jonathan Liu <net147@gmail.com>
|
||||
Date: Wed, 23 Oct 2013 00:28:17 +1100
|
||||
Subject: [PATCH] Fix misaligned selection region with text when centered
|
||||
|
||||
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.
|
||||
|
||||
Upstream-Status: Accepted [https://codereview.qt-project.org/#change,68842]
|
||||
Signed-off-by: Jonathan Liu <net147@gmail.com>
|
||||
|
||||
Task-number: QTBUG-34218
|
||||
Task-number: QTBUG-34234
|
||||
Change-Id: I4f2fadeb38602f62a93773c6e5faecf03b28069f
|
||||
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
|
||||
---
|
||||
src/gui/text/qtextlayout.cpp | 19 ++++++++++++++-----
|
||||
1 file changed, 14 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp
|
||||
index 54d337e..66341e1 100644
|
||||
--- a/src/gui/text/qtextlayout.cpp
|
||||
+++ b/src/gui/text/qtextlayout.cpp
|
||||
@@ -44,6 +44,7 @@
|
||||
|
||||
#include <qthread.h>
|
||||
#include <qfont.h>
|
||||
+#include <qmath.h>
|
||||
#include <qpainter.h>
|
||||
#include <qvarlengtharray.h>
|
||||
#include <qtextformat.h>
|
||||
@@ -946,15 +947,23 @@ static void addSelectedRegionsToPath(QTextEngine *eng, int lineNumber, const QPo
|
||||
continue;
|
||||
}
|
||||
|
||||
- if (lastSelectionWidth > 0)
|
||||
- region->addRect(boundingRect & QRectF(lastSelectionX.toReal(), selectionY, lastSelectionWidth.toReal(), lineHeight));
|
||||
+ 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);
|
||||
+ }
|
||||
|
||||
lastSelectionX = selectionX;
|
||||
lastSelectionWidth = selectionWidth;
|
||||
}
|
||||
}
|
||||
- if (lastSelectionWidth > 0)
|
||||
- region->addRect(boundingRect & QRectF(lastSelectionX.toReal(), selectionY, lastSelectionWidth.toReal(), lineHeight));
|
||||
+ 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);
|
||||
+ }
|
||||
}
|
||||
|
||||
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();
|
||||
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) {
|
||||
p->setPen(QPen(c, 0));
|
||||
}
|
||||
--
|
||||
1.8.4
|
||||
|
|
@ -0,0 +1,74 @@
|
|||
From 5d8a882c11201a29475c5ea71cfb76c9de6573f5 Mon Sep 17 00:00:00 2001
|
||||
From: Jonathan Liu <net147@gmail.com>
|
||||
Date: Wed, 23 Oct 2013 00:28:17 +1100
|
||||
Subject: [PATCH] Fix misaligned selection region with text when centered
|
||||
|
||||
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.
|
||||
|
||||
Upstream-Status: Accepted [https://codereview.qt-project.org/#change,68842]
|
||||
Signed-off-by: Jonathan Liu <net147@gmail.com>
|
||||
|
||||
Task-number: QTBUG-34218
|
||||
Task-number: QTBUG-34234
|
||||
Change-Id: I4f2fadeb38602f62a93773c6e5faecf03b28069f
|
||||
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
|
||||
---
|
||||
src/gui/text/qtextlayout.cpp | 19 ++++++++++++++-----
|
||||
1 file changed, 14 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp
|
||||
index 54d337e..66341e1 100644
|
||||
--- a/src/gui/text/qtextlayout.cpp
|
||||
+++ b/src/gui/text/qtextlayout.cpp
|
||||
@@ -44,6 +44,7 @@
|
||||
|
||||
#include <qthread.h>
|
||||
#include <qfont.h>
|
||||
+#include <qmath.h>
|
||||
#include <qpainter.h>
|
||||
#include <qvarlengtharray.h>
|
||||
#include <qtextformat.h>
|
||||
@@ -946,15 +947,23 @@ static void addSelectedRegionsToPath(QTextEngine *eng, int lineNumber, const QPo
|
||||
continue;
|
||||
}
|
||||
|
||||
- if (lastSelectionWidth > 0)
|
||||
- region->addRect(boundingRect & QRectF(lastSelectionX.toReal(), selectionY, lastSelectionWidth.toReal(), lineHeight));
|
||||
+ 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);
|
||||
+ }
|
||||
|
||||
lastSelectionX = selectionX;
|
||||
lastSelectionWidth = selectionWidth;
|
||||
}
|
||||
}
|
||||
- if (lastSelectionWidth > 0)
|
||||
- region->addRect(boundingRect & QRectF(lastSelectionX.toReal(), selectionY, lastSelectionWidth.toReal(), lineHeight));
|
||||
+ 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);
|
||||
+ }
|
||||
}
|
||||
|
||||
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();
|
||||
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) {
|
||||
p->setPen(QPen(c, 0));
|
||||
}
|
||||
--
|
||||
1.8.4
|
||||
|
|
@ -23,6 +23,7 @@ SRC_URI += " \
|
|||
file://0023-configure-make-freetype-a-configurable-option.patch \
|
||||
file://0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch \
|
||||
file://0026-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch \
|
||||
file://0027-Fix-misaligned-selection-region-with-text-when-cente.patch \
|
||||
"
|
||||
|
||||
DEPENDS += "qtbase-native"
|
||||
|
|
Loading…
Reference in New Issue