Skip to content
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.

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

fix: macOS modal focus behavior #24286

Merged
merged 1 commit into from Jun 29, 2020
Merged

fix: macOS modal focus behavior #24286

merged 1 commit into from Jun 29, 2020

Conversation

codebytere
Copy link
Member

@codebytere codebytere commented Jun 24, 2020

Description of Change

Closes #18502.

Refs #19128 (comment).

Splits out SetActive behavior from OnWindowFocus/OnWindowBlur into a new method OnWindowIsKeyChanged.

Tested with https://gist.github.com/86396ae26e6462de78dbb9abf38402fd and confirmed not to regress #19124.

Before:
Screen Shot 2020-06-24 at 10 21 10 AM

After:
Screen Shot 2020-06-24 at 10 19 45 AM

cc @zcbenz @MarshallOfSound @deepak1556 @erickzhao

Checklist

Release Notes

Notes: Fixed bug on macOS where the main window could be targeted for a focus event when it was disabled behind a modal.

@electron-cation electron-cation bot removed the new-pr 🌱 PR opened in the last 24 hours label Jun 25, 2020
@codebytere codebytere merged commit af48762 into master Jun 29, 2020
@release-clerk
Copy link

release-clerk bot commented Jun 29, 2020

Release Notes Persisted

Fixed bug on macOS where the main window could be targeted for a focus event when it was disabled behind a modal.

@trop
Copy link
Contributor

trop bot commented Jun 29, 2020

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

@trop trop bot removed the target/10-x-y label Jun 29, 2020
@trop
Copy link
Contributor

trop bot commented Jun 29, 2020

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

@trop
Copy link
Contributor

trop bot commented Jun 29, 2020

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

sentialx pushed a commit to sentialx/electron that referenced this pull request Jul 30, 2020
sentialx pushed a commit to sentialx/electron that referenced this pull request Apr 8, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

MacOS modal focus
2 participants