mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Merge pull request #3354 from nishanths/master

Browse source 
Add drag-entered and drag-exited events to Tray
This commit is contained in:
Cheng Zhao 2015-11-11 22:44:05 +08:00
commit 0a5b234e3d
7 changed files with 74 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

16
atom/browser/api/atom_api_tray.cc
View file

@ -74,10 +74,26 @@ void Tray::OnBalloonClosed() {
Emit("balloon-closed");
}
void Tray::OnDrop() {
Emit("drop");
}
void Tray::OnDropFiles(const std::vector<std::string>& files) {
Emit("drop-files", files);
}
void Tray::OnDragEntered() {
Emit("drag-enter");
}
void Tray::OnDragExited() {
Emit("drag-leave");
}
void Tray::OnDragEnded() {
Emit("drag-end");
}
bool Tray::IsDestroyed() const {
return !tray_icon_;
}

4
atom/browser/api/atom_api_tray.h
View file

@ -48,7 +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;