fix window icon

fralonra · Aug 6, 2023 · f0463a0 · f0463a0
1 parent 191654c
commit f0463a0
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 26 deletions.
diff --git a/build/logo/ppd-editor.png b/build/logo/ppd-editor.png
diff --git a/build/logo/ppd-viewer.png b/build/logo/ppd-viewer.png
diff --git a/src/bin/editor.rs b/src/bin/editor.rs
@@ -1,30 +1,25 @@
 #![windows_subsystem = "windows"]
 
+use eframe::IconData;
 use ppd_editor::editor;
 
 fn main() {
     env_logger::init();
 
-    let mut native_options = eframe::NativeOptions {
+    let 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"
+        icon_data: match IconData::try_from_png_bytes(include_bytes!(
+            "../../build/logo/ppd-editor.png"
         )) {
             Ok(icon) => Some(icon),
             Err(err) => {
                 log::warn!("Failed to load window icon: {}", err);
                 None
             }
-        };
-    }
+        },
+        initial_window_size: Some(eframe::epaint::vec2(1200.0, 700.0)),
+        ..Default::default()
+    };
 
     eframe::run_native(
         editor::APP_TITLE,

diff --git a/src/bin/viewer.rs b/src/bin/viewer.rs
@@ -1,30 +1,25 @@
 #![windows_subsystem = "windows"]
 
+use eframe::IconData;
 use ppd_editor::viewer;
 
 fn main() {
     env_logger::init();
 
-    let mut native_options = eframe::NativeOptions {
+    let 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"
+        icon_data: match IconData::try_from_png_bytes(include_bytes!(
+            "../../build/logo/ppd-viewer.png"
         )) {
             Ok(icon) => Some(icon),
             Err(err) => {
                 log::warn!("Failed to load window icon: {}", err);
                 None
             }
-        };
-    }
+        },
+        initial_window_size: Some(eframe::epaint::vec2(1200.0, 700.0)),
+        ..Default::default()
+    };
 
     eframe::run_native(
         viewer::APP_TITLE,