set windows icon

fralonra · Aug 3, 2023 · f659080 · f659080
1 parent 06992bc
commit f659080
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 7 deletions.
diff --git a/build/windows/ppd-editor.ico b/build/windows/ppd-editor.ico
diff --git a/build/windows/ppd-viewer.ico b/build/windows/ppd-viewer.ico
diff --git a/src/bin/editor.rs b/src/bin/editor.rs
@@ -1,16 +1,29 @@
-#![windows_subsystem = "windows"]
-
 use ppd_editor::editor;
 
 fn main() {
     env_logger::init();
 
-    let native_options = eframe::NativeOptions {
+    let mut native_options = eframe::NativeOptions {
         centered: true,
         initial_window_size: Some(eframe::epaint::vec2(1200.0, 700.0)),
         ..Default::default()
     };
 
+    #[cfg(not(target_os = "macos"))]
+    {
+        use eframe::IconData;
+
+        native_options.icon_data = match IconData::try_from_png_bytes(include_bytes!(
+            "../../build/windows/ppd-editor.ico"
+        )) {
+            Ok(icon) => Some(icon),
+            Err(err) => {
+                log::warn!("Failed to load window icon: {}", err);
+                None
+            }
+        };
+    }
+
     eframe::run_native(
         editor::APP_TITLE,
         native_options,

diff --git a/src/bin/viewer.rs b/src/bin/viewer.rs
@@ -1,16 +1,29 @@
-#![windows_subsystem = "windows"]
-
 use ppd_editor::viewer;
 
 fn main() {
     env_logger::init();
 
-    let native_options = eframe::NativeOptions {
+    let mut native_options = eframe::NativeOptions {
         centered: true,
         initial_window_size: Some(eframe::epaint::vec2(1200.0, 700.0)),
         ..Default::default()
     };
 
+    #[cfg(not(target_os = "macos"))]
+    {
+        use eframe::IconData;
+
+        native_options.icon_data = match IconData::try_from_png_bytes(include_bytes!(
+            "../../build/windows/ppd-viewer.ico"
+        )) {
+            Ok(icon) => Some(icon),
+            Err(err) => {
+                log::warn!("Failed to load window icon: {}", err);
+                None
+            }
+        };
+    }
+
     eframe::run_native(
         viewer::APP_TITLE,
         native_options,

diff --git a/src/common.rs b/src/common.rs
@@ -4,7 +4,7 @@ use anyhow::anyhow;
 use eframe::{
     egui::{
         self, widget_text::WidgetTextGalley, Context, CursorIcon, FontData, FontDefinitions,
-        Response, Style, TextStyle, TextureOptions, Ui, WidgetText,
+        Response, TextStyle, TextureOptions, Ui, WidgetText,
     },
     epaint::{vec2, ColorImage, FontFamily, Rect, TextureHandle, Vec2},
 };