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

feat: support mouse-move event of Tray API on Windows (#19265)

Browse source 
* add Tray.mouse-move on win

* change docs
This commit is contained in:
Micha Hanselmann 2019-07-18 10:52:15 -07:00 committed by Shelley Vohr
parent 9711fc895e
commit 2467350180
4 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/api/tray.md
View file

@ -161,7 +161,7 @@ Returns:
Emitted when the mouse exits the tray icon.
#### Event: 'mouse-move' _macOS_
#### Event: 'mouse-move' _macOS_ _Windows_
Returns:

7
shell/browser/ui/win/notify_icon.cc
View file

@ -65,6 +65,13 @@ void NotifyIcon::HandleClickEvent(int modifiers,
}
}
void NotifyIcon::HandleMouseMoveEvent(int modifiers) {
gfx::Point cursorPos = display::Screen::GetScreen()->GetCursorScreenPoint();
// Omit event fired when tray icon is created but cursor is outside of it.
if (GetBounds().Contains(cursorPos))
NotifyMouseMoved(cursorPos, modifiers);
}
void NotifyIcon::ResetIcon() {
NOTIFYICONDATA icon_data;
InitIconData(&icon_data);

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

@ -44,6 +44,9 @@ class NotifyIcon : public TrayIcon {
bool left_button_click,
bool double_button_click);
// Handles a mouse move event from the user.
void HandleMouseMoveEvent(int modifiers);
// Re-creates the status tray icon now after the taskbar has been created.
void ResetIcon();

4
shell/browser/ui/win/notify_icon_host.cc
View file

@ -170,6 +170,10 @@ LRESULT CALLBACK NotifyIconHost::WndProc(HWND hwnd,
(lparam == WM_LBUTTONDOWN || lparam == WM_LBUTTONDBLCLK),
(lparam == WM_LBUTTONDBLCLK || lparam == WM_RBUTTONDBLCLK));
return TRUE;
case WM_MOUSEMOVE:
win_icon->HandleMouseMoveEvent(GetKeyboardModifers());
return TRUE;
}
}
return ::DefWindowProc(hwnd, message, wparam, lparam);