Merge pull request #1543 from deepak1556/tray_icon_patch
tray: send tray icon position as payload onclick OSX and windows
This commit is contained in:
commit
294dbac869
8 changed files with 26 additions and 9 deletions
|
@ -9,6 +9,7 @@
|
|||
#include "atom/browser/api/atom_api_menu.h"
|
||||
#include "atom/browser/browser.h"
|
||||
#include "atom/browser/ui/tray_icon.h"
|
||||
#include "atom/common/native_mate_converters/gfx_converter.h"
|
||||
#include "atom/common/native_mate_converters/image_converter.h"
|
||||
#include "atom/common/native_mate_converters/string16_converter.h"
|
||||
#include "native_mate/constructor.h"
|
||||
|
@ -39,8 +40,8 @@ mate::Wrappable* Tray::New(const gfx::Image& image) {
|
|||
return new Tray(image);
|
||||
}
|
||||
|
||||
void Tray::OnClicked() {
|
||||
Emit("clicked");
|
||||
void Tray::OnClicked(const gfx::Point& pos) {
|
||||
Emit("clicked", pos);
|
||||
}
|
||||
|
||||
void Tray::OnDoubleClicked() {
|
||||
|
|
|
@ -41,7 +41,7 @@ class Tray : public mate::EventEmitter,
|
|||
virtual ~Tray();
|
||||
|
||||
// TrayIconObserver:
|
||||
void OnClicked() override;
|
||||
void OnClicked(const gfx::Point&) override;
|
||||
void OnDoubleClicked() override;
|
||||
void OnBalloonShow() override;
|
||||
void OnBalloonClicked() override;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue