handle 'RGBA' window icon data

(rather than handling 'BGRA' twice..)
Xpra-org · May 6, 2023 · 22c6afe · 22c6afe
1 parent 364cc6b
commit 22c6afe
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/xpra/client/mixins/window_manager.py b/xpra/client/mixins/window_manager.py
@@ -684,13 +684,9 @@ def _window_icon_image(self, wid, width, height, coding, data):
                 self, width, height, coding, len(data), ICON_SHRINKAGE, ICON_OVERLAY)
         if coding=="default":
             img = self.overlay_image
-        elif coding == "BGRA":
+        elif coding in ("BGRA", "RGBA"):
             rowstride = width*4
-            img = Image.frombytes("RGBA", (width,height), memoryview_to_bytes(data), "raw", "BGRA", rowstride, 1)
-            has_alpha = True
-        elif coding in ("BGRA", ):
-            rowstride = width*4
-            img = Image.frombytes("RGBA", (width,height), memoryview_to_bytes(data), "raw", "BGRA", rowstride, 1)
+            img = Image.frombytes("RGBA", (width,height), memoryview_to_bytes(data), "raw", coding, rowstride, 1)
             has_alpha = True
         else:
             from xpra.codecs.pillow.decoder import open_only