Tray: Add drag-end and drop events

diff --git a/atom/browser/api/atom_api_tray.cc b/atom/browser/api/atom_api_tray.cc
index 00b8eda7b54aac71ae3da89b51ff5200167fefc0..0c24240f223c0059ac0b4d3694b3f46d7eeec94a 100644 (file)
--- a/atom/browser/api/atom_api_tray.cc
+++ b/atom/browser/api/atom_api_tray.cc
@@ -74,6 +74,10 @@ void Tray::OnBalloonClosed() {
   Emit("balloon-closed");
 }
 
+void Tray::OnDrop() {
+  Emit("drop");
+}
+
 void Tray::OnDropFiles(const std::vector<std::string>& files) {
   Emit("drop-files", files);
 }
@@ -86,6 +90,10 @@ void Tray::OnDragExited() {
   Emit("drag-leave");
 }
 
+void Tray::OnDragEnded() {
+  Emit("drag-end");
+}
+
 bool Tray::IsDestroyed() const {
   return !tray_icon_;
 }

diff --git a/atom/browser/api/atom_api_tray.h b/atom/browser/api/atom_api_tray.h
index b26796bccedc32aa70ffaab1a59d8eea4b72e5ce..d8d6dcead16cd65c93b541e5f1f6db3a8e1ada89 100644 (file)
--- a/atom/browser/api/atom_api_tray.h
+++ b/atom/browser/api/atom_api_tray.h
@@ -48,9 +48,11 @@ class Tray : public mate::TrackableObject<Tray>,
   void OnBalloonShow() override;
   void OnBalloonClicked() override;
   void OnBalloonClosed() override;
+  void OnDrop() override;
   void OnDropFiles(const std::vector<std::string>& files) override;
   void OnDragEntered() override;
   void OnDragExited() override;
+  void OnDragEnded() override;
 
   // mate::Wrappable:
   bool IsDestroyed() const override;

diff --git a/atom/browser/ui/tray_icon.cc b/atom/browser/ui/tray_icon.cc
index bc69b6e72759d28a28a03865eee0569813979ebc..1696aab276b198c57fb54ab23e122b92ffdf07fb 100644 (file)
--- a/atom/browser/ui/tray_icon.cc
+++ b/atom/browser/ui/tray_icon.cc
@@ -55,6 +55,10 @@ void TrayIcon::NotifyRightClicked(const gfx::Rect& bounds, int modifiers) {
                     OnRightClicked(bounds, modifiers));
 }
 
+void TrayIcon::NotifyDrop() {
+  FOR_EACH_OBSERVER(TrayIconObserver, observers_, OnDrop());
+}
+
 void TrayIcon::NotifyDropFiles(const std::vector<std::string>& files) {
   FOR_EACH_OBSERVER(TrayIconObserver, observers_, OnDropFiles(files));
 }
@@ -67,4 +71,8 @@ void TrayIcon::NotifyDragExited() {
   FOR_EACH_OBSERVER(TrayIconObserver, observers_, OnDragExited());
 }
 
+void TrayIcon::NotifyDragEnded() {
+  FOR_EACH_OBSERVER(TrayIconObserver, observers_, OnDragEnded());
+}
+
 }  // namespace atom

diff --git a/atom/browser/ui/tray_icon.h b/atom/browser/ui/tray_icon.h
index b63d3c48c26223205346f67b58f3acdd11758b93..bc29acd8a255ac4bef434083188ed7428c4e7b89 100644 (file)
--- a/atom/browser/ui/tray_icon.h
+++ b/atom/browser/ui/tray_icon.h
@@ -61,9 +61,11 @@ class TrayIcon {
   void NotifyBalloonClosed();
   void NotifyRightClicked(const gfx::Rect& bounds = gfx::Rect(),
                           int modifiers = 0);
+  void NotifyDrop();
   void NotifyDropFiles(const std::vector<std::string>& files);
   void NotifyDragEntered();
   void NotifyDragExited();
+  void NotifyDragEnded();
 
  protected:
   TrayIcon();

diff --git a/atom/browser/ui/tray_icon_cocoa.mm b/atom/browser/ui/tray_icon_cocoa.mm
index 40505a64d8cdbf4049fe9576cde9a6bb5bc93dc2..c373e94519bbadbae66b5d020f93261822bd34c8 100644 (file)
--- a/atom/browser/ui/tray_icon_cocoa.mm
+++ b/atom/browser/ui/tray_icon_cocoa.mm
@@ -262,6 +262,15 @@ const CGFloat kVerticalTitleMargin = 2;
   trayIcon_->NotifyDragExited();
 }
 
+- (void)draggingEnded:(id <NSDraggingInfo>)sender {
+  trayIcon_->NotifyDragEnded();
+}
+
+- (BOOL)prepareForDragOperation:(id <NSDraggingInfo>)sender {
+  trayIcon_->NotifyDrop();
+  return YES;
+}
+
 - (BOOL)performDragOperation:(id <NSDraggingInfo>)sender {
   NSPasteboard* pboard = [sender draggingPasteboard];
 

diff --git a/atom/browser/ui/tray_icon_observer.h b/atom/browser/ui/tray_icon_observer.h
index e9a8bd33f1d363cf38c33fb705b7acbbd90018d8..ed421ed854529dea76d57bef8b1b01b1962a109f 100644 (file)
--- a/atom/browser/ui/tray_icon_observer.h
+++ b/atom/browser/ui/tray_icon_observer.h
@@ -22,9 +22,11 @@ class TrayIconObserver {
   virtual void OnBalloonClicked() {}
   virtual void OnBalloonClosed() {}
   virtual void OnRightClicked(const gfx::Rect& bounds, int modifiers) {}
+  virtual void OnDrop() {}
   virtual void OnDropFiles(const std::vector<std::string>& files) {}
   virtual void OnDragEntered() {}
   virtual void OnDragExited() {}
+  virtual void OnDragEnded() {}
 
  protected:
   virtual ~TrayIconObserver() {}