tauri-apps/tauri
1
1
Fork 0
mirror of https://github.com/tauri-apps/tauri.git synced 2025-01-02 07:56:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(wry): window event listeners being emitted to all windows (#2056)

Browse Source
This commit is contained in:
Lucas Fernandes Nogueira 2021-06-23 16:20:09 -03:00 committed by GitHub
parent dee71ad583
commit fca976404e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.changes/fix-window-events.md Normal file
View File

@ -0,0 +1,5 @@
---
"tauri-runtime-wry": patch
---
Fixes window event being emitted to all windows listeners.

34
core/tauri-runtime-wry/src/lib.rs
View File

@ -84,7 +84,8 @@ type CreateWebviewHandler = Box<
dyn FnOnce(&EventLoopWindowTarget<Message>, &WebContextStore) -> Result<WebviewWrapper> + Send,
>;
type WindowEventHandler = Box<dyn Fn(&WindowEvent) + Send>;
type WindowEventListeners = Arc<Mutex<HashMap<Uuid, WindowEventHandler>>>;
type WindowEventListenersMap = Arc<Mutex<HashMap<Uuid, WindowEventHandler>>>;
type WindowEventListeners = Arc<Mutex<HashMap<WindowId, WindowEventListenersMap>>>;
type GlobalShortcutListeners = Arc<Mutex<HashMap<AcceleratorId, Box<dyn Fn() + Send>>>>;
macro_rules! dispatcher_getter {
@ -731,6 +732,10 @@ impl Dispatch for WryDispatcher {
.window_event_listeners
.lock()
.unwrap()
.get(&self.window_id)
.unwrap()
.lock()
.unwrap()
.insert(id, Box::new(f));
id
}
@ -1523,7 +1528,15 @@ fn handle_event_loop(
}
Event::WindowEvent { event, window_id } => {
if let Some(event) = WindowEventWrapper::from(&event).0 {
for handler in window_event_listeners.lock().unwrap().values() {
for handler in window_event_listeners
.lock()
.unwrap()
.get(&window_id)
.unwrap()
.lock()
.unwrap()
.values()
{
handler(&event);
}
}
@ -1625,6 +1638,17 @@ fn handle_event_loop(
WindowMessage::Show => window.set_visible(true),
WindowMessage::Hide => window.set_visible(false),
WindowMessage::Close => {
for handler in window_event_listeners
.lock()
.unwrap()
.get(&window.id())
.unwrap()
.lock()
.unwrap()
.values()
{
handler(&WindowEvent::CloseRequested);
}
on_window_close(
callback,
id,
@ -1859,6 +1883,12 @@ fn create_webview<P: Params<Runtime = Wry>>(
};
let window = window_builder.inner.build(event_loop).unwrap();
context
.window_event_listeners
.lock()
.unwrap()
.insert(window.id(), WindowEventListenersMap::default());
#[cfg(feature = "menu")]
context
.menu_event_listeners