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

Add metaKey

Browse source
This commit is contained in:
Cheng Zhao 2015-07-29 14:44:08 +08:00
parent 3e1a5b229c
commit b2f03fc2d8
3 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -136,6 +136,7 @@ v8::Local<v8::Object> Tray::ModifiersToObject(v8::Isolate* isolate,
obj.Set("shiftKey", static_cast<bool>(modifiers & ui::EF_SHIFT_DOWN)); obj.Set("shiftKey", static_cast<bool>(modifiers & ui::EF_SHIFT_DOWN));
obj.Set("ctrlKey", static_cast<bool>(modifiers & ui::EF_CONTROL_DOWN)); obj.Set("ctrlKey", static_cast<bool>(modifiers & ui::EF_CONTROL_DOWN));
obj.Set("altKey", static_cast<bool>(modifiers & ui::EF_ALT_DOWN)); obj.Set("altKey", static_cast<bool>(modifiers & ui::EF_ALT_DOWN));
obj.Set("metaKey", static_cast<bool>(modifiers & ui::EF_COMMAND_DOWN));
return obj.GetHandle(); return obj.GetHandle();
} }

8
atom/browser/ui/win/notify_icon_host.cc
View file

@ -5,6 +5,7 @@
#include "atom/browser/ui/win/notify_icon_host.h" #include "atom/browser/ui/win/notify_icon_host.h"
#include <commctrl.h> #include <commctrl.h>
#include <winuser.h>
#include "atom/browser/ui/win/notify_icon.h" #include "atom/browser/ui/win/notify_icon.h"
#include "base/bind.h" #include "base/bind.h"
@ -28,6 +29,11 @@ const UINT kBaseIconId = 2;
const wchar_t kNotifyIconHostWindowClass[] = L"Electron_NotifyIconHostWindow"; const wchar_t kNotifyIconHostWindowClass[] = L"Electron_NotifyIconHostWindow";
bool IsWinPressed() {
return ((::GetKeyState(VK_LWIN) & 0x8000) == 0x8000) ||
((::GetKeyState(VK_RWIN) & 0x8000) == 0x8000);
}
int GetKeyboardModifers() { int GetKeyboardModifers() {
int modifiers = ui::EF_NONE; int modifiers = ui::EF_NONE;
if (base::win::IsShiftPressed()) if (base::win::IsShiftPressed())
@ -36,6 +42,8 @@ int GetKeyboardModifers() {
modifiers |= ui::EF_CONTROL_DOWN; modifiers |= ui::EF_CONTROL_DOWN;
if (base::win::IsAltPressed()) if (base::win::IsAltPressed())
modifiers |= ui::EF_ALT_DOWN; modifiers |= ui::EF_ALT_DOWN;
if (IsWinPressed())
modifiers |= ui::EF_COMMAND_DOWN;
return modifiers; return modifiers;
} }

3
docs/api/tray.md
View file

@ -51,6 +51,7 @@ Creates a new tray icon associated with the `image`.
* `altKey` Boolean * `altKey` Boolean
* `shiftKey` Boolean * `shiftKey` Boolean
* `ctrlKey` Boolean * `ctrlKey` Boolean
* `metaKey` Boolean
* `bounds` Object - the bounds of tray icon * `bounds` Object - the bounds of tray icon
* `x` Integer * `x` Integer
* `y` Integer * `y` Integer
@ -67,6 +68,7 @@ __Note:__ The `bounds` payload is only implemented on OS X and Windows 7 or newe
* `altKey` Boolean * `altKey` Boolean
* `shiftKey` Boolean * `shiftKey` Boolean
* `ctrlKey` Boolean * `ctrlKey` Boolean
* `metaKey` Boolean
* `bounds` Object - the bounds of tray icon * `bounds` Object - the bounds of tray icon
* `x` Integer * `x` Integer
* `y` Integer * `y` Integer
@ -83,6 +85,7 @@ __Note:__ This is only implemented on OS X and Windows.
* `altKey` Boolean * `altKey` Boolean
* `shiftKey` Boolean * `shiftKey` Boolean
* `ctrlKey` Boolean * `ctrlKey` Boolean
* `metaKey` Boolean
* `bounds` Object - the bounds of tray icon * `bounds` Object - the bounds of tray icon
* `x` Integer * `x` Integer
* `y` Integer * `y` Integer