summaryrefslogtreecommitdiffstats
path: root/winit/src
diff options
context:
space:
mode:
Diffstat (limited to 'winit/src')
-rw-r--r--winit/src/application.rs37
-rw-r--r--winit/src/application/state.rs19
-rw-r--r--winit/src/conversion.rs25
-rw-r--r--winit/src/lib.rs2
-rw-r--r--winit/src/mode.rs12
-rw-r--r--winit/src/settings.rs13
6 files changed, 28 insertions, 80 deletions
diff --git a/winit/src/application.rs b/winit/src/application.rs
index 3a5c3dac..23364209 100644
--- a/winit/src/application.rs
+++ b/winit/src/application.rs
@@ -9,7 +9,7 @@ use crate::mouse;
use crate::renderer;
use crate::widget::operation;
use crate::{
- Command, Debug, Error, Executor, Mode, Proxy, Runtime, Settings, Size,
+ Command, Debug, Error, Executor, Proxy, Runtime, Settings, Size,
Subscription,
};
@@ -81,16 +81,6 @@ where
Subscription::none()
}
- /// Returns the current [`Application`] mode.
- ///
- /// The runtime will automatically transition your application if a new mode
- /// is returned.
- ///
- /// By default, an application will run in windowed mode.
- fn mode(&self) -> Mode {
- Mode::Windowed
- }
-
/// Returns the scale factor of the [`Application`].
///
/// It can be used to dynamically control the size of the UI at runtime
@@ -147,12 +137,15 @@ where
runtime.enter(|| A::new(flags))
};
- let builder = settings.window.into_builder(
- &application.title(),
- application.mode(),
- event_loop.primary_monitor(),
- settings.id,
- );
+ let should_be_visible = settings.window.visible;
+ let builder = settings
+ .window
+ .into_builder(
+ &application.title(),
+ event_loop.primary_monitor(),
+ settings.id,
+ )
+ .with_visible(false);
log::info!("Window builder: {:#?}", builder);
@@ -189,6 +182,7 @@ where
receiver,
init_command,
window,
+ should_be_visible,
settings.exit_on_close_request,
));
@@ -239,6 +233,7 @@ async fn run_instance<A, E, C>(
mut receiver: mpsc::UnboundedReceiver<winit::event::Event<'_, A::Message>>,
init_command: Command<A::Message>,
window: winit::window::Window,
+ should_be_visible: bool,
exit_on_close_request: bool,
) where
A: Application + 'static,
@@ -252,6 +247,7 @@ async fn run_instance<A, E, C>(
let mut clipboard = Clipboard::connect(&window);
let mut cache = user_interface::Cache::default();
let mut surface = compositor.create_surface(&window);
+ let mut visible = false;
let mut state = State::new(&application, &window);
let mut viewport_version = state.viewport_version();
@@ -383,6 +379,7 @@ async fn run_instance<A, E, C>(
event::MacOS::ReceivedUrl(url),
)) => {
use iced_native::event;
+
events.push(iced_native::Event::PlatformSpecific(
event::PlatformSpecific::MacOS(event::MacOS::ReceivedUrl(
url,
@@ -450,6 +447,12 @@ async fn run_instance<A, E, C>(
Ok(()) => {
debug.render_finished();
+ if !visible && should_be_visible {
+ window.set_visible(true);
+
+ visible = true;
+ }
+
// TODO: Handle animations!
// Maybe we can use `ControlFlow::WaitUntil` for this.
}
diff --git a/winit/src/application/state.rs b/winit/src/application/state.rs
index 6b843919..5e953cb5 100644
--- a/winit/src/application/state.rs
+++ b/winit/src/application/state.rs
@@ -1,6 +1,6 @@
use crate::application::{self, StyleSheet as _};
use crate::conversion;
-use crate::{Application, Color, Debug, Mode, Point, Size, Viewport};
+use crate::{Application, Color, Debug, Point, Size, Viewport};
use std::marker::PhantomData;
use winit::event::{Touch, WindowEvent};
@@ -13,7 +13,6 @@ where
<A::Renderer as crate::Renderer>::Theme: application::StyleSheet,
{
title: String,
- mode: Mode,
scale_factor: f64,
viewport: Viewport,
viewport_version: usize,
@@ -31,7 +30,6 @@ where
/// Creates a new [`State`] for the provided [`Application`] and window.
pub fn new(application: &A, window: &Window) -> Self {
let title = application.title();
- let mode = application.mode();
let scale_factor = application.scale_factor();
let theme = application.theme();
let appearance = theme.appearance(application.style());
@@ -47,7 +45,6 @@ where
Self {
title,
- mode,
scale_factor,
viewport,
viewport_version: 0,
@@ -193,20 +190,6 @@ where
self.title = new_title;
}
- // Update window mode
- let new_mode = application.mode();
-
- if self.mode != new_mode {
- window.set_fullscreen(conversion::fullscreen(
- window.current_monitor(),
- new_mode,
- ));
-
- window.set_visible(conversion::visible(new_mode));
-
- self.mode = new_mode;
- }
-
// Update scale factor
let new_scale_factor = application.scale_factor();
diff --git a/winit/src/conversion.rs b/winit/src/conversion.rs
index 74f6f7a0..05c9746e 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,29 +182,6 @@ pub fn position(
}
}
-/// Converts a [`Mode`] to a [`winit`] fullscreen mode.
-///
-/// [`winit`]: https://github.com/rust-windowing/winit
-pub fn fullscreen(
- monitor: Option<winit::monitor::MonitorHandle>,
- mode: Mode,
-) -> Option<winit::window::Fullscreen> {
- match mode {
- Mode::Windowed | Mode::Hidden => None,
- Mode::Fullscreen => {
- Some(winit::window::Fullscreen::Borderless(monitor))
- }
- }
-}
-
-/// Converts a [`Mode`] to a visibility flag.
-pub fn visible(mode: Mode) -> bool {
- match mode {
- Mode::Windowed | Mode::Fullscreen => true,
- Mode::Hidden => false,
- }
-}
-
/// Converts a `MouseCursor` from [`iced_native`] to a [`winit`] cursor icon.
///
/// [`winit`]: https://github.com/rust-windowing/winit
diff --git a/winit/src/lib.rs b/winit/src/lib.rs
index 3bde0f2b..e32cc9af 100644
--- a/winit/src/lib.rs
+++ b/winit/src/lib.rs
@@ -45,14 +45,12 @@ pub mod window;
pub mod system;
mod error;
-mod mode;
mod position;
mod proxy;
pub use application::Application;
pub use clipboard::Clipboard;
pub use error::Error;
-pub use mode::Mode;
pub use position::Position;
pub use proxy::Proxy;
pub use settings::Settings;
diff --git a/winit/src/mode.rs b/winit/src/mode.rs
deleted file mode 100644
index fdce8e23..00000000
--- a/winit/src/mode.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-/// The mode of a window-based application.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum Mode {
- /// The application appears in its own window.
- Windowed,
-
- /// The application takes the whole screen of its current monitor.
- Fullscreen,
-
- /// The application is hidden
- Hidden,
-}
diff --git a/winit/src/settings.rs b/winit/src/settings.rs
index 213ef47f..7175b9ed 100644
--- a/winit/src/settings.rs
+++ b/winit/src/settings.rs
@@ -14,7 +14,7 @@ mod platform;
pub use platform::PlatformSpecific;
use crate::conversion;
-use crate::{Mode, Position};
+use crate::Position;
use winit::monitor::MonitorHandle;
use winit::window::WindowBuilder;
@@ -65,6 +65,9 @@ pub struct Window {
/// The maximum size of the window.
pub max_size: Option<(u32, u32)>,
+ /// Whether the window should be visible or not.
+ pub visible: bool,
+
/// Whether the window should be resizable or not.
pub resizable: bool,
@@ -89,7 +92,6 @@ impl Window {
pub fn into_builder(
self,
title: &str,
- mode: Mode,
primary_monitor: Option<MonitorHandle>,
_id: Option<String>,
) -> WindowBuilder {
@@ -104,8 +106,7 @@ impl Window {
.with_decorations(self.decorations)
.with_transparent(self.transparent)
.with_window_icon(self.icon)
- .with_always_on_top(self.always_on_top)
- .with_visible(conversion::visible(mode));
+ .with_always_on_top(self.always_on_top);
if let Some(position) = conversion::position(
primary_monitor.as_ref(),
@@ -166,9 +167,6 @@ impl Window {
);
}
- window_builder = window_builder
- .with_fullscreen(conversion::fullscreen(primary_monitor, mode));
-
window_builder
}
}
@@ -180,6 +178,7 @@ impl Default for Window {
position: Position::default(),
min_size: None,
max_size: None,
+ visible: true,
resizable: true,
decorations: true,
transparent: false,
generated by cgit (git 2.34.1) at 2025-10-31 08:53:24 +0000