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

Modifiers moved under UI

Browse source
This commit is contained in:
Paul Betts 2016-03-09 11:22:54 -08:00 committed by Cheng Zhao
parent 7b60ef6261
commit 1c01e4955f
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -15,6 +15,7 @@
#include "base/win/win_util.h" #include "base/win/win_util.h"
#include "base/win/wrapped_window_proc.h" #include "base/win/wrapped_window_proc.h"
#include "ui/events/event_constants.h" #include "ui/events/event_constants.h"
#include "ui/events/win/system_event_state_lookup.h"
#include "ui/gfx/win/hwnd_util.h" #include "ui/gfx/win/hwnd_util.h"
namespace atom { namespace atom {
@ -35,11 +36,11 @@ bool IsWinPressed() {
int GetKeyboardModifers() { int GetKeyboardModifers() {
int modifiers = ui::EF_NONE; int modifiers = ui::EF_NONE;
if (base::win::IsShiftPressed()) if (ui::win::IsShiftPressed())
modifiers |= ui::EF_SHIFT_DOWN; modifiers |= ui::EF_SHIFT_DOWN;
if (base::win::IsCtrlPressed()) if (ui::win::IsCtrlPressed())
modifiers |= ui::EF_CONTROL_DOWN; modifiers |= ui::EF_CONTROL_DOWN;
if (base::win::IsAltPressed()) if (ui::win::IsAltPressed())
modifiers |= ui::EF_ALT_DOWN; modifiers |= ui::EF_ALT_DOWN;
if (IsWinPressed()) if (IsWinPressed())
modifiers |= ui::EF_COMMAND_DOWN; modifiers |= ui::EF_COMMAND_DOWN;