1
0
mirror of https://github.com/emilk/egui.git synced 2026-08-31 05:40:03 -04:00

Fix: fall back to default egui icon if non is set (#3610)

It broke in one of the recent multi-viewport prs
This commit is contained in:
Emil Ernerfeldt
2023-11-22 20:54:16 +01:00
committed by GitHub
parent 4ece25bd05
commit 6490dfafb6
3 changed files with 23 additions and 9 deletions

View File

@@ -248,6 +248,9 @@ pub struct NativeOptions {
/// Controls the native window of the root viewport.
///
/// This is where you set things like window title and size.
///
/// If you don't set an icon, a default egui icon will be used.
/// To avoid this, set the icon to [`egui::IconData::default`].
pub viewport: egui::ViewportBuilder,
/// Turn on vertical syncing, limiting the FPS to the display refresh rate.
@@ -379,13 +382,7 @@ impl Clone for NativeOptions {
impl Default for NativeOptions {
fn default() -> Self {
Self {
viewport: egui::ViewportBuilder {
icon: Some(std::sync::Arc::new(
crate::icon_data::from_png_bytes(&include_bytes!("../data/icon.png")[..])
.unwrap(),
)),
..Default::default()
},
viewport: Default::default(),
vsync: true,
multisampling: 0,