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: respect minimizable/closable for customButtonsOnHover #18425

Merged
merged 1 commit into from May 28, 2019

Conversation

codebytere
Copy link
Member

@codebytere codebytere commented May 23, 2019

Description of Change

Fixes #18364.

This PR ameliorates an issue whereby minimizable and closable weren't respected in customButtonsOnHover mode. maximizable isn't addressable here, since it's been blanket disabled in newer versions of macOS owing to an issue with the NSWindowStyleMaskFullSizeContentView style mask. That will, however, be addressed in the relevant backport pull request.

This can be backported to 6 as-is but will need to be manually backported to 5 & 4 to account for the maximizable consideration.

cc @pronebird @MarshallOfSound @nornagon @miniak

Checklist

Release Notes

Notes: Fixed an issue whereby minimizable and closable weren't respected in customButtonsOnHover mode.

@electron-cation electron-cation bot added the new-pr 🌱 PR opened in the last 24 hours label May 23, 2019
Copy link
Member

@nornagon nornagon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This code is a mystery to me but it looks relatively fine.

atom/browser/native_window_mac.mm Show resolved Hide resolved
@electron-cation electron-cation bot removed the new-pr 🌱 PR opened in the last 24 hours label May 24, 2019
@codebytere codebytere merged commit 1688ebd into master May 28, 2019
@release-clerk
Copy link

release-clerk bot commented May 28, 2019

Release Notes Persisted

Fixed an issue whereby minimizable and closable weren't respected in customButtonsOnHover mode.

@codebytere codebytere deleted the custom-on-hover-fix branch May 28, 2019 17:23
@trop
Copy link
Contributor

trop bot commented May 28, 2019

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

@trop
Copy link
Contributor

trop bot commented May 28, 2019

A maintainer has manually backported this PR to "6-0-x", please check out #18478

@trop trop bot added the in-flight/6-0-x label May 29, 2019
@sofianguy sofianguy added this to Fixed for Next Release in 6.1.x May 29, 2019
@sofianguy sofianguy moved this from Fixed for Next Release to Fixed for 6.0.0-beta.5 in 6.1.x May 29, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
5.0.x
Fixed in 5.0.3
6.1.x
Fixed for 6.0.0-beta.5
Development

Successfully merging this pull request may close these issues.

customButtonsOnHover does not respect minimizable nor maximizable options
3 participants