Set window icon on desktop platforms

Cargo.toml

@@ -76,6 +76,11 @@ features = [
 version = "0.13"
 features = ["serialize"]
 
+# Dependencies to set window icon. Versions should match bevy's.
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+image = { version = "0.24", default-features = false, features = ["png"] }
+winit = "0.29"
+
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 # Show panics in the browser console: https://bevy-cheatbook.github.io/platforms/wasm/panic-console.html
 console_error_panic_hook = "0.1"

TODO.md

@@ -3,7 +3,7 @@
 * [x] Loading infrastructure
 * [x] Animated sprites
   * Mostly working, seems to be a bug with bevy_aseprite
-* [ ] Set window icon: https://bevy-cheatbook.github.io/window/icon.html
+* [x] Set window icon: https://bevy-cheatbook.github.io/window/icon.html
 * [ ] Set exe/app icon
   * On Linux
   * On Windows: https://bevy-cheatbook.github.io/platforms/windows.html#creating-an-icon-for-your-app
@@ -46,6 +46,7 @@
 * [x] Update to bevy 0.13
 * [x] Remove input events when egui should consume them:
 https://github.com/mvlabat/bevy_egui/issues/47#issuecomment-1922695612
+* [ ] Move window_state.ron to a local config/data file.
 * Pixel-perfect rendering
   * [x] Remove OS window scaling.
   * [x] Allow scaling window by integer values. Default to 2x

src/window.rs

@@ -69,7 +69,9 @@ impl Plugin for WindowPlugin {
             .add_systems(PostUpdate, update_window_state);
         #[cfg(not(target_arch = "wasm32"))]
         {
-            app.add_systems(Last, save_window_state_on_exit.run_if(on_event::<AppExit>()));
+            app
+                .add_systems(Startup, window_icon::set_window_icon)
+                .add_systems(Last, save_window_state_on_exit.run_if(on_event::<AppExit>()));
 
             app
                 .insert_resource(LogFpsTimer::default())
@@ -78,6 +80,37 @@ impl Plugin for WindowPlugin {
     }
 }
 
+#[cfg(not(target_arch = "wasm32"))]
+mod window_icon {
+    use bevy::prelude::*;
+    use bevy::winit::WinitWindows;
+    use winit::window::Icon;
+
+    pub fn set_window_icon(
+        // Have to use `NonSend` here
+        windows: NonSend<WinitWindows>,
+    ) {
+        // Taken from: https://bevy-cheatbook.github.io/window/icon.html
+        // Use the `image` crate to load our icon data from a png file.
+        // NOTE: This is not a very bevy-native solution, but it will do.
+        let (icon_rgba, icon_width, icon_height) = {
+            let image = image::open("assets/icon.png")
+                .expect("Failed to open icon path")
+                .into_rgba8();
+            let (width, height) = image.dimensions();
+            let rgba = image.into_raw();
+            (rgba, width, height)
+        };
+        let icon = Icon::from_rgba(icon_rgba, icon_width, icon_height)
+            .expect("Could not create Icon from icon data");
+
+        // Do it for all windows.
+        for window in windows.windows.values() {
+            window.set_window_icon(Some(icon.clone()));
+        }
+    }
+}
+
 pub fn update_window_state(
     mut window_state: ResMut<WindowState>,
     window_q: Query<&Window, (With<PrimaryWindow>, Changed<Window>)>,