From c36be1724a71f2f62cc09c28e34547165a80cce7 Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Thu, 24 Oct 2013 10:56:37 +0000 Subject: [PATCH] qtbase: add upstream QTBUG-34218/QTBUG-34234 misaligned selection patch Signed-off-by: Jonathan Liu Signed-off-by: Martin Jansa --- ...election-region-with-text-when-cente.patch | 74 +++++++++++++++++++ ...election-region-with-text-when-cente.patch | 74 +++++++++++++++++++ recipes-qt/qt5/qtbase.inc | 1 + 3 files changed, 149 insertions(+) create mode 100644 recipes-qt/qt5/qtbase-5.1.1/0027-Fix-misaligned-selection-region-with-text-when-cente.patch create mode 100644 recipes-qt/qt5/qtbase-git/0027-Fix-misaligned-selection-region-with-text-when-cente.patch diff --git a/recipes-qt/qt5/qtbase-5.1.1/0027-Fix-misaligned-selection-region-with-text-when-cente.patch b/recipes-qt/qt5/qtbase-5.1.1/0027-Fix-misaligned-selection-region-with-text-when-cente.patch new file mode 100644 index 0000000000..d5e082ea78 --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.1.1/0027-Fix-misaligned-selection-region-with-text-when-cente.patch @@ -0,0 +1,74 @@ +From 5d8a882c11201a29475c5ea71cfb76c9de6573f5 Mon Sep 17 00:00:00 2001 +From: Jonathan Liu +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 + +Task-number: QTBUG-34218 +Task-number: QTBUG-34234 +Change-Id: I4f2fadeb38602f62a93773c6e5faecf03b28069f +Reviewed-by: Gunnar Sletta +--- + 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 + #include ++#include + #include + #include + #include +@@ -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 + diff --git a/recipes-qt/qt5/qtbase-git/0027-Fix-misaligned-selection-region-with-text-when-cente.patch b/recipes-qt/qt5/qtbase-git/0027-Fix-misaligned-selection-region-with-text-when-cente.patch new file mode 100644 index 0000000000..d5e082ea78 --- /dev/null +++ b/recipes-qt/qt5/qtbase-git/0027-Fix-misaligned-selection-region-with-text-when-cente.patch @@ -0,0 +1,74 @@ +From 5d8a882c11201a29475c5ea71cfb76c9de6573f5 Mon Sep 17 00:00:00 2001 +From: Jonathan Liu +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 + +Task-number: QTBUG-34218 +Task-number: QTBUG-34234 +Change-Id: I4f2fadeb38602f62a93773c6e5faecf03b28069f +Reviewed-by: Gunnar Sletta +--- + 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 + #include ++#include + #include + #include + #include +@@ -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 + diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 889ab9985f..ffb37ce43b 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -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"