xfce-panel/systray: Draw icons/background properly when compositing is disabled
PATCH 1/2 xfce-panel/systray: Draw icons/background properly when compositing is disabled
* this was the last long lasting xfce bug that annoyed me
* while at it renumber patches
Signed-off-by Andreas Müller <[email protected]>
---
...=> 0002-use-lxdm-to-replace-dm-tool.patch} | 0
...-icons-without-compositing-Bug-14577.patch | 80 +++++++++++++++++++
.../xfce4-panel/xfce4-panel_4.14.0.bb | 3 +-
3 files changed, 82 insertions(+), 1 deletion(-)
rename meta-xfce/recipes-xfce/xfce4-panel/files/{0001-use-lxdm-to-replace-dm-tool.patch => 0002-use-lxdm-to-replace-dm-tool.patch} (100%)
create mode 100644 meta-xfce/recipes-xfce/xfce4-panel/files/0003-systray-Fix-icons-without-compositing-Bug-14577.patchmeta-xfce/recipes-xfce/xfce4-panel/files/0002-use-lxdm-to-replace-dm-tool.patch renamed from meta-xfce/recipes-xfce/xfce4-panel/files/0001-use-lxdm-to-replace-dm-tool.patch +0 -0
meta-xfce/recipes-xfce/xfce4-panel/files/0003-systray-Fix-icons-without-compositing-Bug-14577.patch new file +80 -0
80 lines not on this page · raw message
meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.14.0.bb +2 -1
@@ -12,7 +12,8 @@ SRC_URI[md5sum] = "940e8b430e28093a2e56e390055bcd51" SRC_URI[sha256sum] = "d5f8f3bd7e142139987e5e62cda26135a424baabb5e47aa0c23b4169d0a66ef4" SRC_URI += " \ file://0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch \ - file://0001-use-lxdm-to-replace-dm-tool.patch \ + file://0002-use-lxdm-to-replace-dm-tool.patch \ + file://0003-systray-Fix-icons-without-compositing-Bug-14577.patch \ " python populate_packages_prepend() {
Signature · 1 line
2.21.0
PATCH 2/2 catfish: upgrade 1.4.9 -> 1.4.10
Signed-off-by Andreas Müller <[email protected]>
---
.../catfish/{catfish_1.4.9.bb => catfish_1.4.10.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-xfce/recipes-apps/catfish/{catfish_1.4.9.bb => catfish_1.4.10.bb} (72%)meta-xfce/recipes-apps/catfish/catfish_1.4.10.bb renamed from meta-xfce/recipes-apps/catfish/catfish_1.4.9.bb +2 -2
@@ -9,8 +9,8 @@ DEPENDS += "python3-distutils-extra-native" B = "${S}" -SRC_URI[md5sum] = "829824fba33e86d03345bbc718e7b2d9" -SRC_URI[sha256sum] = "29a39b85804336e4819dceff203693a5904b7e11d7e024b49b5aab2649ed944e" +SRC_URI[md5sum] = "1b8e7bfd955364b7912fb0a248329b3a" +SRC_URI[sha256sum] = "2573a004105031f871c92fed22a0c4b15bb96f2dff6e36c4f2959f56b62e343d" FILES_${PN} += "${datadir}/metainfo"
Signature · 1 line
2.21.0
Quoted 118 lines · Andreas Müller
* this was the last long lasting xfce bug that annoyed me
* while at it renumber patchesSigned-off-by Andreas Müller <[email protected]>--- ...=> 0002-use-lxdm-to-replace-dm-tool.patch} | 0 ...-icons-without-compositing-Bug-14577.patch | 80 +++++++++++++++++++ .../xfce4-panel/xfce4-panel_4.14.0.bb | 3 +- 3 files changed, 82 insertions(+), 1 deletion(-) rename meta-xfce/recipes-xfce/xfce4-panel/files/{0001-use-lxdm-to-replace-dm-tool.patch => 0002-use-lxdm-to-replace-dm-tool.patch} (100%) create mode 100644 meta-xfce/recipes-xfce/xfce4-panel/files/0003-systray-Fix-icons-without-compositing-Bug-14577.patchmeta-xfce/recipes-xfce/xfce4-panel/files/0002-use-lxdm-to-replace-dm-tool.patch renamed from meta-xfce/recipes-xfce/xfce4-panel/files/0001-use-lxdm-to-replace-dm-tool.patch +0
-0meta-xfce/recipes-xfce/xfce4-panel/files/0003-systray-Fix-icons-without-compositing-Bug-14577.patch new file +80
-0@@ -0,0 +1,80 @@ +From f6f70cce417fd2982c2ce6f01016ed01deb6a9ae Mon Sep 17 00:00:00 2001 +From: "Ivan A. Melnikov" <[email protected]> +Date: Mon, 23 Sep 2019 16:18:10 +0400 +Subject: [PATCH] systray: Fix icons without compositing (Bug #14577) + +Wrapper window uses RGBA visual when it's available; +systray manager should try to do the same for +the transparent or parent-relative background to work. + +That means that the manager and icons will work with +RGBA visual even if the screen is not compositing; so +we should always force-redraw the icons. + +Refs: https://bugzilla.xfce.org/show_bug.cgi?id=14577 +Signed-off-by: Ivan A. Melnikov <[email protected]> + +Upstream-Status: Accepted [1] + +[1] https://git.xfce.org/xfce/xfce4-panel/commit?id=820de57c44c381e47091d3a7e214852bf8fafb53 +--- + plugins/systray/systray-manager.c | 10 ++++++---- + plugins/systray/systray.c | 10 ---------- + 2 files changed, 6 insertions(+), 14 deletions(-) + +diff --git a/plugins/systray/systray-manager.c b/plugins/systray/systray-manager.c +index 68836554..4915649c 100644 +--- a/plugins/systray/systray-manager.c ++++ b/plugins/systray/systray-manager.c +@@ -751,6 +751,7 @@ static void + systray_manager_set_visual (SystrayManager *manager) + { + GdkDisplay *display; ++ GdkVisual *visual; + Visual *xvisual; + Atom visual_atom; + gulong data[1]; +@@ -768,11 +769,12 @@ systray_manager_set_visual (SystrayManager *manager) + visual_atom = gdk_x11_get_xatom_by_name_for_display (display, + "_NET_SYSTEM_TRAY_VISUAL"); + +- if (gdk_screen_is_composited (gtk_widget_get_screen (manager->invisible)) +- && (gdk_screen_get_rgba_visual (screen) != NULL)) ++ visual = gdk_screen_get_rgba_visual (screen); ++ panel_debug (PANEL_DEBUG_SYSTRAY, "rgba visual is %p", visual); ++ if (visual != NULL) + { +- /* get the rgba visual */ +- xvisual = GDK_VISUAL_XVISUAL (gdk_screen_get_rgba_visual (screen)); ++ /* use the rgba visual */ ++ xvisual = GDK_VISUAL_XVISUAL (visual); + } + else + { +diff --git a/plugins/systray/systray.c b/plugins/systray/systray.c +index 3fb9520c..beae1973 100644 +--- a/plugins/systray/systray.c ++++ b/plugins/systray/systray.c +@@ -728,19 +728,9 @@ systray_plugin_box_draw (GtkWidget *box, + gpointer user_data) + { + SystrayPlugin *plugin = XFCE_SYSTRAY_PLUGIN (user_data); +- GdkScreen *screen; +- + panel_return_if_fail (XFCE_IS_SYSTRAY_PLUGIN (plugin)); + panel_return_if_fail (cr != NULL); + +- screen = gtk_widget_get_screen (GTK_WIDGET (plugin)); +- +- if (G_LIKELY (screen != NULL)) +- { +- if (!gdk_screen_is_composited (screen)) +- return; +- } +- + /* separately draw all the composed tray icons after gtk + * handled the draw event */ + gtk_container_foreach (GTK_CONTAINER (box), +-- +2.21.0 +meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.14.0.bb +2
-2@@ -12,7 +12,8 @@ SRC_URI[md5sum] = "940e8b430e28093a2e56e390055bcd51" SRC_URI[sha256sum] = "d5f8f3bd7e142139987e5e62cda26135a424baabb5e47aa0c23b4169d0a66ef4" SRC_URI += " \ file://0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch \ - file://0001-use-lxdm-to-replace-dm-tool.patch \ + file://0002-use-lxdm-to-replace-dm-tool.patch \ + file://0003-systray-Fix-icons-without-compositing-Bug-14577.patch \ " python populate_packages_prepend() { --
Quoted 2 lines
2.21.0
Few minutes age xfce4-panel 4.14.1 was released containing the patch - will send V2 tonight.
Andreas