8000 fix: emit click events with tray context menu by codebytere · Pull Request #24200 · electron/electron · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

fix: emit click events with tray context menu #24200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Jun 22, 2020
Merged

fix: emit click events with tray context menu #24200

merged 1 commit into from
Jun 22, 2020

Conversation

codebytere
Copy link
Member
@codebytere codebytere commented Jun 18, 2020 •
edited
Loading

Description of Change

Closes #24196.

When a context menu is added to a Tray on macOS, the menu controller overrides the mouseUp handler, where click events were emitted. This fixes the issue by pulling click event handling into a separate function, and emitting click events on mouseDown when a menu controller has been set and normally on mouseUp otherwise.

Tested with https://gist.github.com/1ffed70969360d362c807d60fe692404.

cc @MarshallOfSound @nornagon @zcbenz

Checklist

Release Notes

Notes: Fixed an issue with click events not being emitted on macOS for Trays with context menus set.

@electron-cation electron-cation bot added the new-pr 🌱 PR opened recently label Jun 18, 2020
@electron-cation electron-cation bot removed the new-pr 🌱 PR opened recently label Jun 19, 2020
@codebytere codebytere merged commit 046a059 into master Jun 22, 2020
@release-clerk
Copy link
release-clerk bot commented Jun 22, 2020

Release Notes Persisted

Fixed an issue with click events not being emitted on macOS for Trays with context menus set.

@codebytere codebytere deleted the fix-click-events-with-context-menu branch June 22, 2020 15:24
@trop
Copy link
Contributor
trop bot commented Jun 22, 2020

I was unable to backport this PR to "8-x-y" cleanly;
you will need to perform this backport manually.

This was referenced Jun 22, 2020
Merged
Merged
@trop
Copy link
Contributor
trop bot commented Jun 22, 2020

I have automatically backported this PR to "10-x-y", please check out #24235

@trop
Copy link
Contributor
trop bot commented Jun 22, 2020

I have automatically backported this PR to "9-x-y", please check out #24236

@codebytere codebytere mentioned this pull request Jun 22, 2020
Merged
@trop
Copy link
Contributor
trop bot commented Jun 22, 2020

@codebytere has manually backported this PR to "8-x-y", please check out #24239

@codebytere codebytere mentioned this pull request Jun 22, 2020
Merged
5 tasks
sentialx pushed a commit to sentialx/electron that referenced this pull request Jul 30, 2020
@codebytere @sentialx
fix: emit click events with tray context menu (electron#24200)
9db4e14
sentialx pushed a commit to sentialx/electron that referenced this pull request Apr 8, 2021
@codebytere @sentialx
fix: emit click events with tray context menu (electron#24200)
4160f91
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zcbenz zcbenz zcbenz approved these changes

@MarshallOfSound MarshallOfSound Awaiting requested review from MarshallOfSound

@nornagon nornagon Awaiting requested review from nornagon

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Tray event click & double-click not working after setContextMenu on macOS
2 participants
@codebytere @zcbenz
0