win: Add "balloon-show" and "balloon-closed" events

diff --git a/atom/browser/api/atom_api_tray.cc b/atom/browser/api/atom_api_tray.cc
index 81f8378..dfb0d6e 100644 (file)
--- a/atom/browser/api/atom_api_tray.cc
+++ b/atom/browser/api/atom_api_tray.cc
@@ -41,10 +41,18 @@ void Tray::OnDoubleClicked() {
   Emit("double-clicked");
 }
 
+void Tray::OnBalloonShow() {
+  Emit("balloon-show");
+}
+
 void Tray::OnBalloonClicked() {
   Emit("balloon-clicked");
 }
 
+void Tray::OnBalloonClosed() {
+  Emit("balloon-closed");
+}
+
 void Tray::Destroy() {
   tray_icon_.reset();
 }

diff --git a/atom/browser/api/atom_api_tray.h b/atom/browser/api/atom_api_tray.h
index 74b5b1e..87bc84a 100644 (file)
--- a/atom/browser/api/atom_api_tray.h
+++ b/atom/browser/api/atom_api_tray.h
@@ -43,7 +43,9 @@ class Tray : public mate::EventEmitter,
   // TrayIconObserver:
   void OnClicked() override;
   void OnDoubleClicked() override;
+  void OnBalloonShow() override;
   void OnBalloonClicked() override;
+  void OnBalloonClosed() override;
 
   void Destroy();
   void SetImage(mate::Arguments* args, const gfx::ImageSkia& image);

diff --git a/atom/browser/ui/tray_icon.cc b/atom/browser/ui/tray_icon.cc
index 32cb710..a59c0c7 100644 (file)
--- a/atom/browser/ui/tray_icon.cc
+++ b/atom/browser/ui/tray_icon.cc
@@ -31,8 +31,16 @@ void TrayIcon::NotifyDoubleClicked() {
   FOR_EACH_OBSERVER(TrayIconObserver, observers_, OnDoubleClicked());
 }
 
+void TrayIcon::NotifyBalloonShow() {
+  FOR_EACH_OBSERVER(TrayIconObserver, observers_, OnBalloonShow());
+}
+
 void TrayIcon::NotifyBalloonClicked() {
   FOR_EACH_OBSERVER(TrayIconObserver, observers_, OnBalloonClicked());
 }
 
+void TrayIcon::NotifyBalloonClosed() {
+  FOR_EACH_OBSERVER(TrayIconObserver, observers_, OnBalloonClosed());
+}
+
 }  // namespace atom

diff --git a/atom/browser/ui/tray_icon.h b/atom/browser/ui/tray_icon.h
index cb0fdb9..83ee98e 100644 (file)
--- a/atom/browser/ui/tray_icon.h
+++ b/atom/browser/ui/tray_icon.h
@@ -52,7 +52,9 @@ class TrayIcon {
   void RemoveObserver(TrayIconObserver* obs) { observers_.RemoveObserver(obs); }
   void NotifyClicked();
   void NotifyDoubleClicked();
+  void NotifyBalloonShow();
   void NotifyBalloonClicked();
+  void NotifyBalloonClosed();
 
  protected:
   TrayIcon();

diff --git a/atom/browser/ui/tray_icon_observer.h b/atom/browser/ui/tray_icon_observer.h
index 76a1a46..293e537 100644 (file)
--- a/atom/browser/ui/tray_icon_observer.h
+++ b/atom/browser/ui/tray_icon_observer.h
@@ -11,7 +11,9 @@ class TrayIconObserver {
  public:
   virtual void OnClicked() {}
   virtual void OnDoubleClicked() {}
+  virtual void OnBalloonShow() {}
   virtual void OnBalloonClicked() {}
+  virtual void OnBalloonClosed() {}
 
  protected:
   virtual ~TrayIconObserver() {}

diff --git a/atom/browser/ui/win/notify_icon.cc b/atom/browser/ui/win/notify_icon.cc
index b541caf..9784298 100644 (file)
--- a/atom/browser/ui/win/notify_icon.cc
+++ b/atom/browser/ui/win/notify_icon.cc
@@ -71,10 +71,6 @@ void NotifyIcon::HandleClickEvent(const gfx::Point& cursor_pos,
       ui::MENU_SOURCE_MOUSE));
 }
 
-void NotifyIcon::HandleBalloonClickEvent() {
-  NotifyBalloonClicked();
-}
-
 void NotifyIcon::ResetIcon() {
   NOTIFYICONDATA icon_data;
   InitIconData(&icon_data);

diff --git a/atom/browser/ui/win/notify_icon.h b/atom/browser/ui/win/notify_icon.h
index 37b0ee7..2ac309d 100644 (file)
--- a/atom/browser/ui/win/notify_icon.h
+++ b/atom/browser/ui/win/notify_icon.h
@@ -35,9 +35,6 @@ class NotifyIcon : public TrayIcon {
   // otherwise displays the context menu if there is one.
   void HandleClickEvent(const gfx::Point& cursor_pos, bool left_button_click);
 
-  // Handles a click on the balloon from the user.
-  void HandleBalloonClickEvent();
-
   // Re-creates the status tray icon now after the taskbar has been created.
   void ResetIcon();
 

diff --git a/atom/browser/ui/win/notify_icon_host.cc b/atom/browser/ui/win/notify_icon_host.cc
index 83ee6e4..14dcf6d 100644 (file)
--- a/atom/browser/ui/win/notify_icon_host.cc
+++ b/atom/browser/ui/win/notify_icon_host.cc
@@ -132,8 +132,16 @@ LRESULT CALLBACK NotifyIconHost::WndProc(HWND hwnd,
       return TRUE;
 
     switch (lparam) {
+      case TB_CHECKBUTTON:
+        win_icon->NotifyBalloonShow();
+        return TRUE;
+
       case TB_INDETERMINATE:
-        win_icon->HandleBalloonClickEvent();
+        win_icon->NotifyBalloonClicked();
+        return TRUE;
+
+      case TB_HIDEBUTTON:
+        win_icon->NotifyBalloonClosed();
         return TRUE;
 
       case WM_LBUTTONDOWN: