github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-10 07:58:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

win: Don't emit right-clicked event when there is menu attached

Browse Source
This commit is contained in:
Cheng Zhao
2015-08-10 12:52:55 +08:00
parent 58dee04d5c
commit 225140bd64
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
atom/browser/ui/win/notify_icon.cc
View File

@@ -86,8 +86,10 @@ void NotifyIcon::HandleClickEvent(const gfx::Point& cursor_pos,
NotifyClicked(gfx::Rect(rect), modifiers);
return;
} else if (!double_button_click) { // single right click
NotifyRightClicked(gfx::Rect(rect), modifiers);
PopContextMenu(cursor_pos);
if (menu_model_)
PopContextMenu(cursor_pos);
else
NotifyRightClicked(gfx::Rect(rect), modifiers);
}
}