me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into advanced-text

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2023-03-17 20:17:23 +01:00
commit d1dc62ebcd
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
7 changed files with 21 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/window.rs
View file

@ -6,7 +6,7 @@ pub mod icon;
pub use icon::Icon;
pub use position::Position;
pub use settings::Settings;
pub use settings::{PlatformSpecific, Settings};
pub use crate::core::window::*;
pub use crate::runtime::window::*;

8
src/window/settings.rs
View file

@ -1,5 +1,7 @@
use crate::window::{Icon, Position};
pub use iced_winit::settings::PlatformSpecific;
/// The window settings of an application.
#[derive(Debug, Clone)]
pub struct Settings {
@ -32,6 +34,9 @@ pub struct Settings {
/// The icon of the window.
pub icon: Option<Icon>,
/// Platform specific settings.
pub platform_specific: PlatformSpecific,
}
impl Default for Settings {
@ -47,6 +52,7 @@ impl Default for Settings {
transparent: false,
always_on_top: false,
icon: None,
platform_specific: Default::default(),
}
}
}
@ -64,7 +70,7 @@ impl From<Settings> for iced_winit::settings::Window {
transparent: settings.transparent,
always_on_top: settings.always_on_top,
icon: settings.icon.map(Icon::into),
platform_specific: Default::default(),
platform_specific: settings.platform_specific,
}
}
}