From c0d03af4704c828698e06e9662dab1087c99c42e Mon Sep 17 00:00:00 2001
From: Amr Bashir <amr.bashir2015@gmail.com>
Date: Tue, 3 Oct 2023 13:53:47 +0300
Subject: [PATCH] refactor!: renamed `TrayIconBuilder/TrayIcon::on_tray_event`
 to `TrayIconBuilder/TrayIcon::on_tray_icon_event` (#7943)

---
 .changes/tauri-tray-on-tray-event.md |  5 +++++
 core/tauri/src/tray.rs               | 23 +++++++++++++++--------
 2 files changed, 20 insertions(+), 8 deletions(-)
 create mode 100644 .changes/tauri-tray-on-tray-event.md

diff --git a/.changes/tauri-tray-on-tray-event.md b/.changes/tauri-tray-on-tray-event.md
new file mode 100644
index 00000000000..89abc7caeb6
--- /dev/null
+++ b/.changes/tauri-tray-on-tray-event.md
@@ -0,0 +1,5 @@
+---
+'tauri': 'patch:breaking'
+---
+
+Changed `TrayIconBuilder/TrayIcon::on_tray_event` to `TrayIconBuilder/TrayIcon::on_tray_icon_event` for consistency of naming.
diff --git a/core/tauri/src/tray.rs b/core/tauri/src/tray.rs
index be6ea773dc5..d4811c0c976 100644
--- a/core/tauri/src/tray.rs
+++ b/core/tauri/src/tray.rs
@@ -109,7 +109,7 @@ impl From<tray_icon::TrayIconEvent> for TrayIconEvent {
 #[derive(Default)]
 pub struct TrayIconBuilder<R: Runtime> {
   on_menu_event: Option<GlobalMenuEventListener<AppHandle<R>>>,
-  on_tray_event: Option<GlobalTrayIconEventListener<TrayIcon<R>>>,
+  on_tray_icon_event: Option<GlobalTrayIconEventListener<TrayIcon<R>>>,
   inner: tray_icon::TrayIconBuilder,
 }
 
@@ -124,7 +124,7 @@ impl<R: Runtime> TrayIconBuilder<R> {
     Self {
       inner: tray_icon::TrayIconBuilder::new(),
       on_menu_event: None,
-      on_tray_event: None,
+      on_tray_icon_event: None,
     }
   }
 
@@ -223,11 +223,11 @@ impl<R: Runtime> TrayIconBuilder<R> {
   }
 
   /// Set a handler for this tray icon events.
-  pub fn on_tray_event<F: Fn(&TrayIcon<R>, TrayIconEvent) + Sync + Send + 'static>(
+  pub fn on_tray_icon_event<F: Fn(&TrayIcon<R>, TrayIconEvent) + Sync + Send + 'static>(
     mut self,
     f: F,
   ) -> Self {
-    self.on_tray_event.replace(Box::new(f));
+    self.on_tray_icon_event.replace(Box::new(f));
     self
   }
 
@@ -247,7 +247,11 @@ impl<R: Runtime> TrayIconBuilder<R> {
       app_handle: manager.app_handle().clone(),
     };
 
-    icon.register(&icon.app_handle, self.on_menu_event, self.on_tray_event);
+    icon.register(
+      &icon.app_handle,
+      self.on_menu_event,
+      self.on_tray_icon_event,
+    );
 
     Ok(icon)
   }
@@ -285,7 +289,7 @@ impl<R: Runtime> TrayIcon<R> {
     &self,
     app_handle: &AppHandle<R>,
     on_menu_event: Option<GlobalMenuEventListener<AppHandle<R>>>,
-    on_tray_event: Option<GlobalTrayIconEventListener<TrayIcon<R>>>,
+    on_tray_icon_event: Option<GlobalTrayIconEventListener<TrayIcon<R>>>,
   ) {
     if let Some(handler) = on_menu_event {
       app_handle
@@ -297,7 +301,7 @@ impl<R: Runtime> TrayIcon<R> {
         .push(handler);
     }
 
-    if let Some(handler) = on_tray_event {
+    if let Some(handler) = on_tray_icon_event {
       app_handle
         .manager
         .inner
@@ -337,7 +341,10 @@ impl<R: Runtime> TrayIcon<R> {
   }
 
   /// Register a handler for this tray icon events.
-  pub fn on_tray_event<F: Fn(&TrayIcon<R>, TrayIconEvent) + Sync + Send + 'static>(&self, f: F) {
+  pub fn on_tray_icon_event<F: Fn(&TrayIcon<R>, TrayIconEvent) + Sync + Send + 'static>(
+    &self,
+    f: F,
+  ) {
     self
       .app_handle
       .manager