diff options
Diffstat (limited to 'dev-qt/qtdeclarative/files')
-rw-r--r-- | dev-qt/qtdeclarative/files/qtdeclarative-5.14.2-QQuickMouseArea-stuck-in-pressed-state.patch | 55 | ||||
-rw-r--r-- | dev-qt/qtdeclarative/files/qtdeclarative-5.14.2-fix-subpixel-positioned-text.patch | 64 |
2 files changed, 0 insertions, 119 deletions
diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.14.2-QQuickMouseArea-stuck-in-pressed-state.patch b/dev-qt/qtdeclarative/files/qtdeclarative-5.14.2-QQuickMouseArea-stuck-in-pressed-state.patch deleted file mode 100644 index 1dd0ff1155de..000000000000 --- a/dev-qt/qtdeclarative/files/qtdeclarative-5.14.2-QQuickMouseArea-stuck-in-pressed-state.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 8ace780b5aa298e3c01903bfd57f766a42209191 Mon Sep 17 00:00:00 2001 -From: Frederik Gladhorn <frederik.gladhorn@remarkable.com> -Date: Sat, 28 Mar 2020 15:14:41 +0100 -Subject: [PATCH] Fix QQuickMouseArea getting stuck in pressed state when - hiding in press -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf8 -Content-Transfer-Encoding: 8bit - -In 78c1fcbc49f56463064eef738a475d9018357b24 we stopped giving the -exclusive grab to hidden or disabled items with is good. But the change -did not take into consideration how mouse area handles its internal -state. - -As a simple example: A mouse area that would set itself hiddin in the -press handler, would continue to have d->pressed == true, which means it -would not react to any future press events. - -The fix is to let mouse area check in its change handler whether it has -become invisible. -The test also checks that enabled behaves the same way. There is no -action needed, since mouse area does completely custom handling of -enabled (maybe something to fix in Qt 6), disabling a mouse area doesn't -disable its children for example, it doesn't invoke -QQuickItem::setEnabled at all. Due to this circumventing the common -behavior, by chance disabling a mouse area in the on pressed handler -works. - -Fixes: QTBUG-74987 -Change-Id: Idb8499b3e5bcb744fbba203fdea5c46695bd5077 -Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io> ---- - src/quick/items/qquickmousearea.cpp | 6 ++++ - 3 files changed, 80 insertions(+) - create mode 100644 tests/auto/quick/qquickmousearea/data/settingHiddenInPressUngrabs.qml - -diff --git a/src/quick/items/qquickmousearea.cpp b/src/quick/items/qquickmousearea.cpp -index 368379f5c40..dc60712a9cd 100644 ---- a/src/quick/items/qquickmousearea.cpp -+++ b/src/quick/items/qquickmousearea.cpp -@@ -1083,6 +1083,12 @@ void QQuickMouseArea::itemChange(ItemChange change, const ItemChangeData &value) - } - setHovered(!d->hovered); - } -+ if (d->pressed && (!isVisible())) { -+ // This happens when the mouse area sets itself disabled or hidden -+ // inside the press handler. In that case we should not keep the internal -+ // state as pressed, since we never became the mouse grabber. -+ ungrabMouse(); -+ } - break; - default: - break; --- -2.16.3 diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.14.2-fix-subpixel-positioned-text.patch b/dev-qt/qtdeclarative/files/qtdeclarative-5.14.2-fix-subpixel-positioned-text.patch deleted file mode 100644 index 23eaa7d5100d..000000000000 --- a/dev-qt/qtdeclarative/files/qtdeclarative-5.14.2-fix-subpixel-positioned-text.patch +++ /dev/null @@ -1,64 +0,0 @@ -From e807f9d1d80559b8ff91f1c3cfdd755b3da56a6d Mon Sep 17 00:00:00 2001 -From: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> -Date: Tue, 5 May 2020 11:36:24 +0200 -Subject: [PATCH] Fix subpixel positioned text with Text.NativeRendering - -We would be generating subpixel positioned glyphs based on the -relative positions of the glyphs, ignoring the fractional part -contributed by the origin of the text. So if the text origin was -inside a pixel, the subpixel antialiasing would be wrong and we -would see kerning errors. - -This was especially visible when using AlignHCenter on text -with hinting disabled and resizing the item it was aligning to. - -Pick-to: 5.15 -Task-number: QTBUG-49646 -Change-Id: I0e709ba2b5d2440e34c94c6f819befe0a65a113a -Reviewed-by: Lars Knoll <lars.knoll@qt.io> -Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> ---- - src/quick/scenegraph/qsgdefaultglyphnode_p.cpp | 9 ++++----- - 1 file changed, 4 insertions(+), 5 deletions(-) - -diff --git a/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp -index cfa645bfd03..f73b64f537f 100644 ---- a/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp -+++ b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp -@@ -789,11 +789,12 @@ void QSGTextMaskMaterial::populate(const QPointF &p, - const QMargins &margins) - { - Q_ASSERT(m_font.isValid()); -+ QPointF position(p.x(), p.y() - m_font.ascent()); - QVector<QFixedPoint> fixedPointPositions; - const int glyphPositionsSize = glyphPositions.size(); - fixedPointPositions.reserve(glyphPositionsSize); - for (int i=0; i < glyphPositionsSize; ++i) -- fixedPointPositions.append(QFixedPoint::fromPointF(glyphPositions.at(i))); -+ fixedPointPositions.append(QFixedPoint::fromPointF(position + glyphPositions.at(i))); - - QTextureGlyphCache *cache = glyphCache(); - -@@ -815,18 +816,16 @@ void QSGTextMaskMaterial::populate(const QPointF &p, - Q_ASSERT(geometry->sizeOfVertex() == sizeof(QVector4D)); - ushort *ip = geometry->indexDataAsUShort(); - -- QPointF position(p.x(), p.y() - m_font.ascent()); - bool supportsSubPixelPositions = fontD->fontEngine->supportsSubPixelPositions(); - for (int i=0; i<glyphIndexes.size(); ++i) { -+ QPointF glyphPosition = glyphPositions.at(i) + position; - QFixed subPixelPosition; - if (supportsSubPixelPositions) -- subPixelPosition = fontD->fontEngine->subPixelPositionForX(QFixed::fromReal(glyphPositions.at(i).x())); -+ subPixelPosition = fontD->fontEngine->subPixelPositionForX(QFixed::fromReal(glyphPosition.x())); - - QTextureGlyphCache::GlyphAndSubPixelPosition glyph(glyphIndexes.at(i), subPixelPosition); - const QTextureGlyphCache::Coord &c = cache->coords.value(glyph); - -- QPointF glyphPosition = glyphPositions.at(i) + position; -- - // On a retina screen the glyph positions are not pre-scaled (as opposed to - // eg. the raster paint engine). To ensure that we get the same behavior as - // the raster engine (and CoreText itself) when it comes to rounding of the --- -2.16.3 |