diff options
Diffstat (limited to 'winit/src/conversion.rs')
-rw-r--r-- | winit/src/conversion.rs | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/winit/src/conversion.rs b/winit/src/conversion.rs index 74f6f7a0..ba5b0002 100644 --- a/winit/src/conversion.rs +++ b/winit/src/conversion.rs @@ -6,7 +6,7 @@ use crate::keyboard; use crate::mouse; use crate::touch; use crate::window; -use crate::{Event, Mode, Point, Position}; +use crate::{Event, Point, Position}; /// Converts a winit window event into an iced event. pub fn window_event( @@ -182,26 +182,36 @@ pub fn position( } } -/// Converts a [`Mode`] to a [`winit`] fullscreen mode. +/// Converts a [`window::Mode`] to a [`winit`] fullscreen mode. /// /// [`winit`]: https://github.com/rust-windowing/winit pub fn fullscreen( monitor: Option<winit::monitor::MonitorHandle>, - mode: Mode, + mode: window::Mode, ) -> Option<winit::window::Fullscreen> { match mode { - Mode::Windowed | Mode::Hidden => None, - Mode::Fullscreen => { + window::Mode::Windowed | window::Mode::Hidden => None, + window::Mode::Fullscreen => { Some(winit::window::Fullscreen::Borderless(monitor)) } } } -/// Converts a [`Mode`] to a visibility flag. -pub fn visible(mode: Mode) -> bool { +/// Converts a [`window::Mode`] to a visibility flag. +pub fn visible(mode: window::Mode) -> bool { match mode { - Mode::Windowed | Mode::Fullscreen => true, - Mode::Hidden => false, + window::Mode::Windowed | window::Mode::Fullscreen => true, + window::Mode::Hidden => false, + } +} + +/// Converts a [`winit`] fullscreen mode to a [`window::Mode`]. +/// +/// [`winit`]: https://github.com/rust-windowing/winit +pub fn mode(mode: Option<winit::window::Fullscreen>) -> window::Mode { + match mode { + None => window::Mode::Windowed, + Some(_) => window::Mode::Fullscreen, } } |