Signed-off-by: Eric Ruei <[email protected]> --- ...orations-bradient-display-window-icon-onl.patch | 42 ++++++++++++++++++++++ .../recipes-qt/qt5/qtwayland_git.bbappend | 6 ++++ 2 files changed, 48 insertions(+) create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwayland/0001-plugins-decorations-bradient-display-window-icon-onl.patch create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend
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 new file mode 100644 index 0000000..33f2839 --- /dev/null +++ b/meta-arago-distro/recipes-qt/qt5/qtwayland/0001-plugins-decorations-bradient-display-window-icon-onl.patch @@ -0,0 +1,42 @@ +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 new file mode 100644 index 0000000..82d98e5 --- /dev/null +++ b/meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend @@ -0,0 +1,6 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +PR_append = ".arago0" + +SRC_URI += " \ + file://0001-plugins-decorations-bradient-display-window-icon-onl.patch \ +" -- 1.9.1 _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
