Merge pull request #1738 from nicoburns/update-winit-0.28
Update to winit 0.28
This commit is contained in:
commit
c61a4cc21c
11 changed files with 78 additions and 45 deletions
|
|
@ -1,4 +1,4 @@
|
|||
use crate::window::{Icon, Position};
|
||||
use crate::window::{Icon, Level, Position};
|
||||
|
||||
pub use iced_winit::settings::PlatformSpecific;
|
||||
|
||||
|
|
@ -29,8 +29,8 @@ pub struct Settings {
|
|||
/// Whether the window should be transparent.
|
||||
pub transparent: bool,
|
||||
|
||||
/// Whether the window will always be on top of other windows.
|
||||
pub always_on_top: bool,
|
||||
/// The window [`Level`].
|
||||
pub level: Level,
|
||||
|
||||
/// The icon of the window.
|
||||
pub icon: Option<Icon>,
|
||||
|
|
@ -50,7 +50,7 @@ impl Default for Settings {
|
|||
resizable: true,
|
||||
decorations: true,
|
||||
transparent: false,
|
||||
always_on_top: false,
|
||||
level: Level::default(),
|
||||
icon: None,
|
||||
platform_specific: Default::default(),
|
||||
}
|
||||
|
|
@ -68,7 +68,7 @@ impl From<Settings> for iced_winit::settings::Window {
|
|||
resizable: settings.resizable,
|
||||
decorations: settings.decorations,
|
||||
transparent: settings.transparent,
|
||||
always_on_top: settings.always_on_top,
|
||||
level: settings.level,
|
||||
icon: settings.icon.map(Icon::into),
|
||||
platform_specific: settings.platform_specific,
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue