migrations/winit
1
0
Fork 0
mirror of https://github.com/rust-windowing/winit.git synced 2026-06-27 15:13:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Properly remove window mouse event listeners (#2632)

Browse Source 
* Properly remove window mouse event listeners

* Update CHANGELOG.md

* Fix formatting

Co-authored-by: Mads Marquart <mads@marquart.dk>
This commit is contained in:
Douglas Dwyer
2023-01-21 10:58:05 -05:00
committed by GitHub
parent 809162fbd0
commit b711a11549
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/platform_impl/web/web_sys/event_handle.rs
View File

@@ -1,10 +1,11 @@
use wasm_bindgen::{prelude::Closure, JsCast};
use web_sys::{AddEventListenerOptions, EventTarget};
use web_sys::{AddEventListenerOptions, EventListenerOptions, EventTarget};
pub(super) struct EventListenerHandle<T: ?Sized> {
target: EventTarget,
event_type: &'static str,
listener: Closure<T>,
options: EventListenerOptions,
}
impl<T: ?Sized> EventListenerHandle<T> {
@@ -20,6 +21,7 @@ impl<T: ?Sized> EventListenerHandle<T> {
target,
event_type,
listener,
options: EventListenerOptions::new(),
}
}
@@ -44,6 +46,7 @@ impl<T: ?Sized> EventListenerHandle<T> {
target,
event_type,
listener,
options: options.clone().unchecked_into(),
}
}
}
@@ -51,9 +54,10 @@ impl<T: ?Sized> EventListenerHandle<T> {
impl<T: ?Sized> Drop for EventListenerHandle<T> {
fn drop(&mut self) {
self.target
.remove_event_listener_with_callback(
.remove_event_listener_with_callback_and_event_listener_options(
self.event_type,
self.listener.as_ref().unchecked_ref(),
&self.options,
)
.unwrap_or_else(|e| {
web_sys::console::error_2(