瀏覽代碼

fix(tauri-runtime-wry): trigger global tray event listeners

Lucas Nogueira 3 年之前
父節點
當前提交
fa44c44379
共有 1 個文件被更改,包括 11 次插入5 次删除
  1. 11 5
      core/tauri-runtime-wry/src/lib.rs

+ 11 - 5
core/tauri-runtime-wry/src/lib.rs

@@ -2628,12 +2628,12 @@ fn handle_event_loop<T: UserEvent>(
         for handler in handlers {
           handler(&event);
         }
+      }
 
-        let global_listeners = system_tray_manager.global_listeners.lock().unwrap();
-        let global_listeners_iter = global_listeners.iter();
-        for global_listener in global_listeners_iter {
-          global_listener(tray_id, &event);
-        }
+      let global_listeners = system_tray_manager.global_listeners.lock().unwrap();
+      let global_listeners_iter = global_listeners.iter();
+      for global_listener in global_listeners_iter {
+        global_listener(tray_id, &event);
       }
     }
     #[cfg(all(desktop, feature = "system-tray"))]
@@ -2662,6 +2662,12 @@ fn handle_event_loop<T: UserEvent>(
           handler(&event);
         }
       }
+
+      let global_listeners = system_tray_manager.global_listeners.lock().unwrap();
+      let global_listeners_iter = global_listeners.iter();
+      for global_listener in global_listeners_iter {
+        global_listener(id.0, &event);
+      }
     }
     Event::WindowEvent {
       event, window_id, ..