summaryrefslogtreecommitdiffstats
path: root/winit/src
diff options
context:
space:
mode:
Diffstat (limited to 'winit/src')
-rw-r--r--winit/src/application.rs4
-rw-r--r--winit/src/multi_window.rs7
2 files changed, 7 insertions, 4 deletions
diff --git a/winit/src/application.rs b/winit/src/application.rs
index 1f97d911..13d9282d 100644
--- a/winit/src/application.rs
+++ b/winit/src/application.rs
@@ -128,7 +128,7 @@ pub fn default(theme: &Theme) -> Appearance {
/// Runs an [`Application`] with an executor, compositor, and the provided
/// settings.
-pub fn run<A, E, C>(
+pub async fn run<A, E, C>(
settings: Settings<A::Flags>,
compositor_settings: C::Settings,
) -> Result<(), Error>
@@ -219,7 +219,7 @@ where
};
}
- let compositor = C::new(compositor_settings, window.clone())?;
+ let compositor = C::new(compositor_settings, window.clone()).await?;
let mut renderer = compositor.create_renderer();
for font in settings.fonts {
diff --git a/winit/src/multi_window.rs b/winit/src/multi_window.rs
index ec2f86ea..18db1fb5 100644
--- a/winit/src/multi_window.rs
+++ b/winit/src/multi_window.rs
@@ -12,7 +12,9 @@ use crate::core::widget::operation;
use crate::core::window;
use crate::core::{Point, Size};
use crate::futures::futures::channel::mpsc;
-use crate::futures::futures::{task, Future, StreamExt};
+use crate::futures::futures::executor;
+use crate::futures::futures::task;
+use crate::futures::futures::{Future, StreamExt};
use crate::futures::{Executor, Runtime, Subscription};
use crate::graphics::{compositor, Compositor};
use crate::multi_window::window_manager::WindowManager;
@@ -184,7 +186,8 @@ where
};
}
- let mut compositor = C::new(compositor_settings, main_window.clone())?;
+ let mut compositor =
+ executor::block_on(C::new(compositor_settings, main_window.clone()))?;
let mut window_manager = WindowManager::new();
let _ = window_manager.insert(