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

Win: Implement context menu for tray icon.

Browse source
This commit is contained in:
Cheng Zhao 2014-06-03 11:52:57 +08:00
parent 1cb135f7f2
commit 9ef7ecbdaf
2 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
atom/browser/ui/win/notify_icon.cc
View file

@ -4,6 +4,7 @@
#include "atom/browser/ui/win/notify_icon.h" #include "atom/browser/ui/win/notify_icon.h"
#include "atom/browser/ui/win/menu_2.h"
#include "atom/browser/ui/win/notify_icon_host.h" #include "atom/browser/ui/win/notify_icon_host.h"
#include "base/strings/string_number_conversions.h" #include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
@ -22,7 +23,8 @@ NotifyIcon::NotifyIcon(NotifyIconHost* host,
: host_(host), : host_(host),
icon_id_(id), icon_id_(id),
window_(window), window_(window),
message_id_(message) { message_id_(message),
menu_model_(NULL) {
NOTIFYICONDATA icon_data; NOTIFYICONDATA icon_data;
InitIconData(&icon_data); InitIconData(&icon_data);
icon_data.uFlags = NIF_MESSAGE; icon_data.uFlags = NIF_MESSAGE;
@ -50,7 +52,6 @@ void NotifyIcon::HandleClickEvent(const gfx::Point& cursor_pos,
return; return;
} }
/*
if (!menu_model_) if (!menu_model_)
return; return;
@ -59,15 +60,8 @@ void NotifyIcon::HandleClickEvent(const gfx::Point& cursor_pos,
if (!SetForegroundWindow(window_)) if (!SetForegroundWindow(window_))
return; return;
menu_runner_.reset(new views::MenuRunner(menu_model_)); scoped_ptr<Menu2> menu(new Menu2(menu_model_));
menu->RunContextMenuAt(cursor_pos);
ignore_result(menu_runner_->RunMenuAt(NULL,
NULL,
gfx::Rect(cursor_pos, gfx::Size()),
views::MENU_ANCHOR_TOPLEFT,
ui::MENU_SOURCE_MOUSE,
views::MenuRunner::HAS_MNEMONICS));
*/
} }
void NotifyIcon::ResetIcon() { void NotifyIcon::ResetIcon() {
@ -120,6 +114,7 @@ void NotifyIcon::SetToolTip(const std::string& tool_tip) {
} }
void NotifyIcon::SetContextMenu(ui::SimpleMenuModel* menu_model) { void NotifyIcon::SetContextMenu(ui::SimpleMenuModel* menu_model) {
menu_model_ = menu_model;
} }
void NotifyIcon::InitIconData(NOTIFYICONDATA* icon_data) { void NotifyIcon::InitIconData(NOTIFYICONDATA* icon_data) {

3
atom/browser/ui/win/notify_icon.h
View file

@ -66,6 +66,9 @@ class NotifyIcon : public TrayIcon {
// The currently-displayed icon for the window. // The currently-displayed icon for the window.
base::win::ScopedHICON icon_; base::win::ScopedHICON icon_;
// The context menu.
ui::SimpleMenuModel* menu_model_;
DISALLOW_COPY_AND_ASSIGN(NotifyIcon); DISALLOW_COPY_AND_ASSIGN(NotifyIcon);
}; };