Add "click" event for TrayIcon.
This commit is contained in:
parent
9699dbb71f
commit
cbd9366898
6 changed files with 43 additions and 1 deletions
1
atom.gyp
1
atom.gyp
|
@ -143,6 +143,7 @@
|
||||||
'atom/browser/ui/tray_icon_gtk.cc',
|
'atom/browser/ui/tray_icon_gtk.cc',
|
||||||
'atom/browser/ui/tray_icon_cocoa.h',
|
'atom/browser/ui/tray_icon_cocoa.h',
|
||||||
'atom/browser/ui/tray_icon_cocoa.mm',
|
'atom/browser/ui/tray_icon_cocoa.mm',
|
||||||
|
'atom/browser/ui/tray_icon_observer.h',
|
||||||
'atom/browser/ui/tray_icon_win.cc',
|
'atom/browser/ui/tray_icon_win.cc',
|
||||||
'atom/browser/ui/tray_icon_win.h',
|
'atom/browser/ui/tray_icon_win.h',
|
||||||
'atom/browser/ui/win/menu_2.cc',
|
'atom/browser/ui/win/menu_2.cc',
|
||||||
|
|
|
@ -31,6 +31,10 @@ mate::Wrappable* Tray::New(const gfx::ImageSkia& image) {
|
||||||
return new Tray(image);
|
return new Tray(image);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Tray::OnClicked() {
|
||||||
|
Emit("clicked");
|
||||||
|
}
|
||||||
|
|
||||||
void Tray::SetImage(const gfx::ImageSkia& image) {
|
void Tray::SetImage(const gfx::ImageSkia& image) {
|
||||||
tray_icon_->SetImage(image);
|
tray_icon_->SetImage(image);
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,6 +8,7 @@
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
#include "atom/browser/api/event_emitter.h"
|
#include "atom/browser/api/event_emitter.h"
|
||||||
|
#include "atom/browser/ui/tray_icon_observer.h"
|
||||||
#include "base/memory/scoped_ptr.h"
|
#include "base/memory/scoped_ptr.h"
|
||||||
|
|
||||||
namespace gfx {
|
namespace gfx {
|
||||||
|
@ -22,7 +23,8 @@ namespace api {
|
||||||
|
|
||||||
class Menu;
|
class Menu;
|
||||||
|
|
||||||
class Tray : public mate::EventEmitter {
|
class Tray : public mate::EventEmitter,
|
||||||
|
public TrayIconObserver {
|
||||||
public:
|
public:
|
||||||
static mate::Wrappable* New(const gfx::ImageSkia& image);
|
static mate::Wrappable* New(const gfx::ImageSkia& image);
|
||||||
|
|
||||||
|
@ -33,6 +35,9 @@ class Tray : public mate::EventEmitter {
|
||||||
explicit Tray(const gfx::ImageSkia& image);
|
explicit Tray(const gfx::ImageSkia& image);
|
||||||
virtual ~Tray();
|
virtual ~Tray();
|
||||||
|
|
||||||
|
// TrayIcon implementations:
|
||||||
|
virtual void OnClicked() OVERRIDE;
|
||||||
|
|
||||||
void SetImage(const gfx::ImageSkia& image);
|
void SetImage(const gfx::ImageSkia& image);
|
||||||
void SetPressedImage(const gfx::ImageSkia& image);
|
void SetPressedImage(const gfx::ImageSkia& image);
|
||||||
void SetToolTip(const std::string& tool_tip);
|
void SetToolTip(const std::string& tool_tip);
|
||||||
|
|
|
@ -12,4 +12,8 @@ TrayIcon::TrayIcon() {
|
||||||
TrayIcon::~TrayIcon() {
|
TrayIcon::~TrayIcon() {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void TrayIcon::NotifyClicked() {
|
||||||
|
FOR_EACH_OBSERVER(TrayIconObserver, observers_, OnClicked());
|
||||||
|
}
|
||||||
|
|
||||||
} // namespace atom
|
} // namespace atom
|
||||||
|
|
|
@ -7,6 +7,8 @@
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
|
#include "atom/browser/ui/tray_icon_observer.h"
|
||||||
|
#include "base/observer_list.h"
|
||||||
#include "ui/base/models/simple_menu_model.h"
|
#include "ui/base/models/simple_menu_model.h"
|
||||||
|
|
||||||
namespace atom {
|
namespace atom {
|
||||||
|
@ -32,10 +34,16 @@ class TrayIcon {
|
||||||
// Set the context menu for this icon.
|
// Set the context menu for this icon.
|
||||||
virtual void SetContextMenu(ui::SimpleMenuModel* menu_model) = 0;
|
virtual void SetContextMenu(ui::SimpleMenuModel* menu_model) = 0;
|
||||||
|
|
||||||
|
void AddObserver(TrayIconObserver* obs) { observers_.AddObserver(obs); }
|
||||||
|
void RemoveObserver(TrayIconObserver* obs) { observers_.RemoveObserver(obs); }
|
||||||
|
void NotifyClicked();
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
TrayIcon();
|
TrayIcon();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
ObserverList<TrayIconObserver> observers_;
|
||||||
|
|
||||||
DISALLOW_COPY_AND_ASSIGN(TrayIcon);
|
DISALLOW_COPY_AND_ASSIGN(TrayIcon);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
20
atom/browser/ui/tray_icon_observer.h
Normal file
20
atom/browser/ui/tray_icon_observer.h
Normal file
|
@ -0,0 +1,20 @@
|
||||||
|
// Copyright (c) 2014 GitHub, Inc. All rights reserved.
|
||||||
|
// Use of this source code is governed by the MIT license that can be
|
||||||
|
// found in the LICENSE file.
|
||||||
|
|
||||||
|
#ifndef ATOM_BROWSER_UI_TRAY_ICON_OBSERVER_H_
|
||||||
|
#define ATOM_BROWSER_UI_TRAY_ICON_OBSERVER_H_
|
||||||
|
|
||||||
|
namespace atom {
|
||||||
|
|
||||||
|
class TrayIconObserver {
|
||||||
|
public:
|
||||||
|
virtual void OnClicked() {};
|
||||||
|
|
||||||
|
protected:
|
||||||
|
virtual ~TrayIconObserver() {};
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace atom
|
||||||
|
|
||||||
|
#endif // ATOM_BROWSER_UI_TRAY_ICON_OBSERVER_H_
|
Loading…
Add table
Add a link
Reference in a new issue