Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1780318: Handle keyboard activation in Windows SystemStatusBar. r=mconley

Browse Source 
When the user wishes to open the window with the mouse, the shell sends NIN_SELECT.
We could continue to use WM_LBUTTONUP there, but the semantic notification is probably better.
When the user presses the space/enter key to open the window, the shell sends NIN_KEYSELECT.
When the user activates the context menu either with the mouse or the keyboard (applications/shift+f10 key), the shell sends WM_CONTEXTMENU.

Differential Revision: https://phabricator.services.mozilla.com/D152234
This commit is contained in:
James Teh 2022-07-25 22:01:35 +00:00
parent af5711925c
commit 0333dc5fb2
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
widget/windows/SystemStatusBar.cpp
View File

@ -209,7 +209,8 @@ nsresult StatusBarEntry::OnComplete(imgIContainer* aImage) {
LRESULT StatusBarEntry::OnMessage(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) {
if (msg == WM_USER &&
(LOWORD(lp) == WM_LBUTTONUP || LOWORD(lp) == WM_RBUTTONUP)) {
(LOWORD(lp) == NIN_SELECT || LOWORD(lp) == NIN_KEYSELECT ||
LOWORD(lp) == WM_CONTEXTMENU)) {
nsMenuFrame* menu = do_QueryFrame(mMenu->GetPrimaryFrame());
if (!menu) {
return TRUE;
@ -233,7 +234,15 @@ LRESULT StatusBarEntry::OnMessage(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) {
return TRUE;
}
if (LOWORD(lp) == WM_LBUTTONUP &&
if (LOWORD(lp) == NIN_KEYSELECT && ::GetForegroundWindow() == win) {
// When enter is pressed on the icon, the shell sends two NIN_KEYSELECT
// notifications. This might cause us to open two windows. To work around
// this, if we're already the foreground window (which happens below),
// ignore this notification.
return TRUE;
}
if (LOWORD(lp) != WM_CONTEXTMENU &&
mMenu->HasAttr(kNameSpaceID_None, nsGkAtoms::contextmenu)) {
::SetForegroundWindow(win);
nsEventStatus status = nsEventStatus_eIgnore;