From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kdeclarative/files/
Date: Tue, 19 Jul 2022 15:42:02 +0000 (UTC) [thread overview]
Message-ID: <1658245268.e7dca2d6fbaaaaf32806c6c2d4532faacbdb8161.asturm@gentoo> (raw)
commit: e7dca2d6fbaaaaf32806c6c2d4532faacbdb8161
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 19 15:41:08 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jul 19 15:41:08 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7dca2d6
kde-frameworks/kdeclarative: Drop obsolete patch
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../kdeclarative-5.95.0-fix-potd-centered.patch | 54 ----------------------
1 file changed, 54 deletions(-)
diff --git a/kde-frameworks/kdeclarative/files/kdeclarative-5.95.0-fix-potd-centered.patch b/kde-frameworks/kdeclarative/files/kdeclarative-5.95.0-fix-potd-centered.patch
deleted file mode 100644
index cac44a4333bf..000000000000
--- a/kde-frameworks/kdeclarative/files/kdeclarative-5.95.0-fix-potd-centered.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 41b3d0b142387c3acbba73f6ac332b3f314f7700 Mon Sep 17 00:00:00 2001
-From: Fushan Wen <qydwhotmail@gmail.com>
-Date: Thu, 9 Jun 2022 12:57:55 +0800
-Subject: [PATCH] qmlcontrols: add `Pad` fill mode in `QImageItem`
-
-This matches the behavior in `QQuickImage`.
-
-BUG: 389623
-FIXED-IN: 5.96
----
- src/qmlcontrols/kquickcontrolsaddons/qimageitem.cpp | 7 ++++++-
- src/qmlcontrols/kquickcontrolsaddons/qimageitem.h | 1 +
- 2 files changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/qmlcontrols/kquickcontrolsaddons/qimageitem.cpp b/src/qmlcontrols/kquickcontrolsaddons/qimageitem.cpp
-index 36929eed..060069a1 100644
---- a/src/qmlcontrols/kquickcontrolsaddons/qimageitem.cpp
-+++ b/src/qmlcontrols/kquickcontrolsaddons/qimageitem.cpp
-@@ -103,7 +103,11 @@ void QImageItem::paint(QPainter *painter)
- painter->scale(1, height() / (qreal)m_image.height());
- }
-
-- if (m_fillMode >= Tile) {
-+ if (m_fillMode == Pad) {
-+ QRect centeredRect = m_paintedRect;
-+ centeredRect.moveCenter(m_image.rect().center());
-+ painter->drawImage(m_paintedRect, m_image, centeredRect);
-+ } else if (m_fillMode >= Tile) {
- painter->drawTiledPixmap(m_paintedRect, QPixmap::fromImage(m_image));
- } else {
- painter->drawImage(m_paintedRect, m_image, m_image.rect());
-@@ -174,6 +178,7 @@ void QImageItem::updatePaintedRect()
- }
- case Stretch:
- case Tile:
-+ case Pad:
- default:
- destRect = boundingRect().toRect();
- }
-diff --git a/src/qmlcontrols/kquickcontrolsaddons/qimageitem.h b/src/qmlcontrols/kquickcontrolsaddons/qimageitem.h
-index f32ae7da..ba38a4a1 100644
---- a/src/qmlcontrols/kquickcontrolsaddons/qimageitem.h
-+++ b/src/qmlcontrols/kquickcontrolsaddons/qimageitem.h
-@@ -32,6 +32,7 @@ public:
- Tile, // the image is duplicated horizontally and vertically
- TileVertically, // the image is stretched horizontally and tiled vertically
- TileHorizontally, // the image is stretched vertically and tiled horizontally
-+ Pad, /**< the image is not transformed @since 5.96 **/
- };
- Q_ENUM(FillMode)
-
---
-GitLab
-
reply other threads:[~2022-07-19 15:42 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1658245268.e7dca2d6fbaaaaf32806c6c2d4532faacbdb8161.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox