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.

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

fix: set cancelId to 1 when defaultId == 0 and no 'cancel' button #17123

Merged
merged 1 commit into from Feb 27, 2019
Merged

fix: set cancelId to 1 when defaultId == 0 and no 'cancel' button #17123

merged 1 commit into from Feb 27, 2019

Conversation

MarshallOfSound
Copy link
Member

Description of Change

Previously when no cancelId was provided and it couldn't be detected based on "cancel" or "no" values cancelId defaulted to 0 which overrode the default style applied to the button on macOS if defaultId was set to 0 as well.

This change ensures that the dialog defaults can never collide like that when it matters

Fixes #17101

Release Notes

Notes: Fixed defaultId not taking affect when set to 0 and no "cancel" button was present on macOS

@MarshallOfSound MarshallOfSound requested a review from a team February 25, 2019 18:15
@electron-cation electron-cation bot added the new-pr 🌱 PR opened in the last 24 hours label Feb 25, 2019
@MarshallOfSound MarshallOfSound removed the new-pr 🌱 PR opened in the last 24 hours label Feb 25, 2019
@electron-cation electron-cation bot added the new-pr 🌱 PR opened in the last 24 hours label Feb 25, 2019
@electron-cation electron-cation bot removed the new-pr 🌱 PR opened in the last 24 hours label Feb 26, 2019
@codebytere codebytere merged commit 0806658 into master Feb 27, 2019
@release-clerk
Copy link

release-clerk bot commented Feb 27, 2019

Release Notes Persisted

Fixed defaultId not taking affect when set to 0 and no "cancel" button was present on macOS

@codebytere codebytere deleted the fix-default-id-when-no-cancel branch February 27, 2019 08:24
@trop trop bot mentioned this pull request Feb 27, 2019
Merged
@trop
Copy link
Contributor

trop bot commented Feb 27, 2019

I have automatically backported this PR to "3-1-x", please check out #17149

@trop trop bot mentioned this pull request Feb 27, 2019
Merged
@trop
Copy link
Contributor

trop bot commented Feb 27, 2019

I have automatically backported this PR to "5-0-x", please check out #17150

@trop trop bot mentioned this pull request Feb 27, 2019
Merged
@trop
Copy link
Contributor

trop bot commented Feb 27, 2019

I have automatically backported this PR to "4-0-x", please check out #17151

@sofianguy sofianguy added this to Fixed in 3.1.5 in 3.1.x Mar 5, 2019
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

@codebytere codebytere codebytere approved these changes

Assignees
No one assigned
Labels
None yet
Projects
No open projects
3.1.x
Fixed in 3.1.5
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@MarshallOfSound @zcbenz @codebytere