From 718fe5b7de6c705b1797c49d382182182acdbe80 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Wed, 8 May 2024 23:14:37 +0200 Subject: Pass `WindowHandle` by value to `window::run_with_handle` --- runtime/src/window.rs | 2 +- runtime/src/window/action.rs | 2 +- winit/src/application.rs | 2 +- winit/src/multi_window.rs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/runtime/src/window.rs b/runtime/src/window.rs index 24171e3e..e32465d3 100644 --- a/runtime/src/window.rs +++ b/runtime/src/window.rs @@ -197,7 +197,7 @@ pub fn change_icon(id: Id, icon: Icon) -> Command { /// Note that if the window closes before this call is processed the callback will not be run. pub fn run_with_handle( id: Id, - f: impl FnOnce(&WindowHandle<'_>) -> Message + 'static, + f: impl FnOnce(WindowHandle<'_>) -> Message + 'static, ) -> Command { Command::single(command::Action::Window(Action::RunWithHandle( id, diff --git a/runtime/src/window/action.rs b/runtime/src/window/action.rs index e44ff5a6..07e77872 100644 --- a/runtime/src/window/action.rs +++ b/runtime/src/window/action.rs @@ -106,7 +106,7 @@ pub enum Action { /// said, it's usually in the same ballpark as on Windows. ChangeIcon(Id, Icon), /// Runs the closure with the native window handle of the window with the given [`Id`]. - RunWithHandle(Id, Box) -> T + 'static>), + RunWithHandle(Id, Box) -> T + 'static>), /// Screenshot the viewport of the window. Screenshot(Id, Box T + 'static>), } diff --git a/winit/src/application.rs b/winit/src/application.rs index 3bc29255..f7508b4c 100644 --- a/winit/src/application.rs +++ b/winit/src/application.rs @@ -1050,7 +1050,7 @@ pub fn run_command( use window::raw_window_handle::HasWindowHandle; if let Ok(handle) = window.window_handle() { - proxy.send(tag(&handle)); + proxy.send(tag(handle)); } } diff --git a/winit/src/multi_window.rs b/winit/src/multi_window.rs index 673a6f30..4cc08d18 100644 --- a/winit/src/multi_window.rs +++ b/winit/src/multi_window.rs @@ -1223,7 +1223,7 @@ fn run_command( .get_mut(id) .and_then(|window| window.raw.window_handle().ok()) { - proxy.send(tag(&handle)); + proxy.send(tag(handle)); } } window::Action::Screenshot(id, tag) => { -- cgit