From 668eeaaea86a207d6f6316019717185eb43e477a Mon Sep 17 00:00:00 2001 From: Hugal31 Date: Wed, 5 Oct 2022 15:14:23 +0200 Subject: [PATCH] Fix icon decoding on X11 Glutin is waiting for an RGBA buffer with 8-bit depth, but our icon is 16-bit depth. So we need to normalize the color data when decoding the icon. --- alacritty/src/display/window.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/alacritty/src/display/window.rs b/alacritty/src/display/window.rs index 95b42345..f6f0f77a 100644 --- a/alacritty/src/display/window.rs +++ b/alacritty/src/display/window.rs @@ -326,11 +326,13 @@ impl Window { pub fn get_platform_window(identity: &Identity, window_config: &WindowConfig) -> WindowBuilder { #[cfg(feature = "x11")] let icon = { - let decoder = Decoder::new(Cursor::new(WINDOW_ICON)); + let mut decoder = Decoder::new(Cursor::new(WINDOW_ICON)); + decoder.set_transformations(png::Transformations::normalize_to_color8()); let mut reader = decoder.read_info().expect("invalid embedded icon"); let mut buf = vec![0; reader.output_buffer_size()]; let _ = reader.next_frame(&mut buf); Icon::from_rgba(buf, reader.info().width, reader.info().height) + .expect("invalid embedded icon format") }; let builder = WindowBuilder::new() @@ -343,7 +345,7 @@ impl Window { .with_fullscreen(window_config.fullscreen()); #[cfg(feature = "x11")] - let builder = builder.with_window_icon(icon.ok()); + let builder = builder.with_window_icon(Some(icon)); #[cfg(feature = "x11")] let builder = match window_config.decorations_theme_variant() {