From: Randolph Sapp <[email protected]> This seems like it was a needless patch to guard against garbage from being shown if the window icon request failed to return any useful icon. Not necessary.
Signed-off-by: Randolph Sapp <[email protected]> --- ...ons-bradient-display-window-icon-onl.patch | 42 ------------------- .../recipes-qt/qt5/qtwayland_git.bbappend | 4 -- 2 files changed, 46 deletions(-) delete mode 100644 meta-arago-distro/recipes-qt/qt5/qtwayland/0001-plugins-decorations-bradient-display-window-icon-onl.patch diff --git a/meta-arago-distro/recipes-qt/qt5/qtwayland/0001-plugins-decorations-bradient-display-window-icon-onl.patch b/meta-arago-distro/recipes-qt/qt5/qtwayland/0001-plugins-decorations-bradient-display-window-icon-onl.patch deleted file mode 100644 index 33f28390..00000000 --- a/meta-arago-distro/recipes-qt/qt5/qtwayland/0001-plugins-decorations-bradient-display-window-icon-onl.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 547fd678ba55025c3578f021b40c96b1e91b839e Mon Sep 17 00:00:00 2001 -From: Eric Ruei <[email protected]> -Date: Fri, 9 Sep 2016 16:54:02 -0400 -Subject: [PATCH] plugins/decorations/bradient: display window icon only if - icon.pixmap not null - -Signed-off-by: Eric Ruei <[email protected]> ---- - src/plugins/decorations/bradient/main.cpp | 17 ++++++++++------- - 1 file changed, 10 insertions(+), 7 deletions(-) - -diff --git a/src/plugins/decorations/bradient/main.cpp b/src/plugins/decorations/bradient/main.cpp -index ea29869..279bff1 100644 ---- a/src/plugins/decorations/bradient/main.cpp -+++ b/src/plugins/decorations/bradient/main.cpp -@@ -222,13 +222,16 @@ void QWaylandBradientDecoration::paint(QPaintDevice *device) - // Window icon - QIcon icon = waylandWindow()->windowIcon(); - if (!icon.isNull()) { -- QPixmap pixmap = icon.pixmap(QSize(128, 128)); -- QPixmap scaled = pixmap.scaled(22, 22, Qt::IgnoreAspectRatio, Qt::SmoothTransformation); -- -- QRectF iconRect(0, 0, 22, 22); -- p.drawPixmap(iconRect.adjusted(margins().left() + BUTTON_SPACING, 4, -- margins().left() + BUTTON_SPACING, 4), -- scaled, iconRect); -+ QPixmap pixmap = icon.pixmap(QSize(128, 128)); -+ if(!pixmap.isNull()) -+ { -+ QPixmap scaled = pixmap.scaled(22, 22, Qt::IgnoreAspectRatio, Qt::SmoothTransformation); -+ -+ QRectF iconRect(0, 0, 22, 22); -+ p.drawPixmap(iconRect.adjusted(margins().left() + BUTTON_SPACING, 4, -+ margins().left() + BUTTON_SPACING, 4), -+ scaled, iconRect); -+ } - } - - // Window title --- -1.9.1 - diff --git a/meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend b/meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend index df8b5eff..e7560d02 100644 --- a/meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend +++ b/meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend @@ -1,8 +1,4 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" PR:append = ".arago2" -SRC_URI += " \ - file://0001-plugins-decorations-bradient-display-window-icon-onl.patch \ -" - PACKAGECONFIG:remove = "xcomposite-egl xcomposite-glx" -- 2.40.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#14355): https://lists.yoctoproject.org/g/meta-arago/message/14355 Mute This Topic: https://lists.yoctoproject.org/mt/98524822/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-arago/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
