diff options
| author |  Héctor Ramón Jiménez <hector0193@gmail.com> | 2023-03-17 20:17:23 +0100 |
|---|---|---|
| committer | Héctor Ramón Jiménez <hector0193@gmail.com> | 2023-03-17 20:17:23 +0100 |
| commit | d1dc62ebcdab6ec57605d276a02d6dae1e97c30d (patch) | |
| tree | 66ab2733d426b887731ba32b32c03a0f1ba43451 /src | |
| parent | ea50ec8df1431c9c6aa8077cd1578c4698dc0314 (diff) | |
| parent | d7fffaa801423ae989fa7693f5b1cb424194e1ff (diff) | |
| download | iced-d1dc62ebcdab6ec57605d276a02d6dae1e97c30d.tar.gz iced-d1dc62ebcdab6ec57605d276a02d6dae1e97c30d.tar.bz2 iced-d1dc62ebcdab6ec57605d276a02d6dae1e97c30d.zip | |
Merge branch 'master' into advanced-text
Diffstat (limited to 'src')
| -rw-r--r-- | src/window.rs | 2 | ||||
| -rw-r--r-- | src/window/settings.rs | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/window.rs b/src/window.rs index 824915b2..e4601575 100644 --- a/src/window.rs +++ b/src/window.rs @@ -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::*; diff --git a/src/window/settings.rs b/src/window/settings.rs index 24d0f4f9..3c8da62f 100644 --- a/src/window/settings.rs +++ b/src/window/settings.rs @@ -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, } } } |