diff options
| -rw-r--r-- | glutin/src/application.rs | 6 | ||||
| -rw-r--r-- | winit/src/application.rs | 8 |
2 files changed, 6 insertions, 8 deletions
diff --git a/glutin/src/application.rs b/glutin/src/application.rs index 96b982ac..24f315fb 100644 --- a/glutin/src/application.rs +++ b/glutin/src/application.rs @@ -197,7 +197,7 @@ async fn run_instance<A, E, C>( use glutin::event; use iced_winit::futures::stream::StreamExt; - let mut clipboard = Clipboard::connect(&context.window()); + let mut clipboard = Clipboard::connect(context.window()); let mut cache = user_interface::Cache::default(); let mut state = application::State::new(&application, context.window()); let mut viewport_version = state.viewport_version(); @@ -219,7 +219,7 @@ async fn run_instance<A, E, C>( let mut user_interface = ManuallyDrop::new(application::build_user_interface( - &mut application, + &application, user_interface::Cache::default(), &mut renderer, state.logical_size(), @@ -286,7 +286,7 @@ async fn run_instance<A, E, C>( user_interface = ManuallyDrop::new(application::build_user_interface( - &mut application, + &application, cache, &mut renderer, state.logical_size(), diff --git a/winit/src/application.rs b/winit/src/application.rs index a27adf3a..3d58da0f 100644 --- a/winit/src/application.rs +++ b/winit/src/application.rs @@ -280,7 +280,7 @@ async fn run_instance<A, E, C>( runtime.track(application.subscription()); let mut user_interface = ManuallyDrop::new(build_user_interface( - &mut application, + &application, cache, &mut renderer, state.logical_size(), @@ -346,7 +346,7 @@ async fn run_instance<A, E, C>( let should_exit = application.should_exit(); user_interface = ManuallyDrop::new(build_user_interface( - &mut application, + &application, cache, &mut renderer, state.logical_size(), @@ -659,9 +659,7 @@ pub fn run_command<A, E>( } }, command::Action::Widget(action) => { - let mut current_cache = - std::mem::replace(cache, user_interface::Cache::default()); - + let mut current_cache = std::mem::take(cache); let mut current_operation = Some(action.into_operation()); while let Some(mut operation) = current_operation.take() { |