diff options
| author |  Gigas002 <24297712+Gigas002@users.noreply.github.com> | 2024-03-27 19:47:48 +0900 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2024-03-27 19:47:48 +0900 |
| commit | 19afc66cadfc7ea230d4d749b0d7b0197e29cf93 (patch) | |
| tree | d012dff84003f2d7d18a1e6bc4bdac62df73b322 /winit/src/multi_window.rs | |
| parent | 4334e63ba1dd88b367f3b7f2790b7869d11d12c0 (diff) | |
| parent | 1df1cf82f4c9485533f2566c8490cfe188b4ae6a (diff) | |
| download | iced-19afc66cadfc7ea230d4d749b0d7b0197e29cf93.tar.gz iced-19afc66cadfc7ea230d4d749b0d7b0197e29cf93.tar.bz2 iced-19afc66cadfc7ea230d4d749b0d7b0197e29cf93.zip | |
Merge branch 'master' into viewer_content_fit
Diffstat (limited to '')
| -rw-r--r-- | winit/src/multi_window.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/winit/src/multi_window.rs b/winit/src/multi_window.rs index 18db1fb5..b4c25411 100644 --- a/winit/src/multi_window.rs +++ b/winit/src/multi_window.rs @@ -16,6 +16,7 @@ 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; use crate::graphics::{compositor, Compositor}; use crate::multi_window::window_manager::WindowManager; use crate::runtime::command::{self, Command}; @@ -105,7 +106,7 @@ where /// settings. pub fn run<A, E, C>( settings: Settings<A::Flags>, - compositor_settings: C::Settings, + graphics_settings: graphics::Settings, ) -> Result<(), Error> where A: Application + 'static, @@ -187,7 +188,7 @@ where } let mut compositor = - executor::block_on(C::new(compositor_settings, main_window.clone()))?; + executor::block_on(C::new(graphics_settings, main_window.clone()))?; let mut window_manager = WindowManager::new(); let _ = window_manager.insert( |