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: draggable regions on MAS #37466

Merged
merged 2 commits into from
Mar 2, 2023
Merged

fix: draggable regions on MAS #37466

merged 2 commits into from
Mar 2, 2023

Conversation

nornagon
Copy link
Member

@nornagon nornagon commented Mar 1, 2023

Description of Change

This makes draggable regions work on MAS builds again, after they broke in
#35603.

The mas_disable_custom_window_frame.patch patch prevents the Chrome custom frame from being used on MAS, but the new draggable regions impl on macOS requires it, so we need to find another way of getting this behavior without tripping the MAS guards.

Fixes #37414.

Checklist

Release Notes

Notes: Fixed draggable regions not working in Mac App Store builds.

@nornagon nornagon added semver/patch backwards-compatible bug fixes target/23-x-y PR should also be added to the "23-x-y" branch. target/24-x-y PR should also be added to the "24-x-y" branch. labels Mar 1, 2023
@electron-cation electron-cation bot added the new-pr 🌱 PR opened in the last 24 hours label Mar 1, 2023
MarshallOfSound
MarshallOfSound approved these changes Mar 2, 2023
View reviewed changes
Copy link
Member

@MarshallOfSound MarshallOfSound left a comment

Choose a reason for hiding this comment

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

Terrifying, I love it. One non-blocking nit on the dcheck

shell/browser/ui/cocoa/electron_ns_window.mm Show resolved Hide resolved
@nornagon nornagon merged commit 76c825d into main Mar 2, 2023
@nornagon nornagon deleted the fix-mas-draggable-regions branch March 2, 2023 19:21
@release-clerk
Copy link

release-clerk bot commented Mar 2, 2023

Release Notes Persisted

Fixed draggable regions not working in Mac App Store builds.

This was referenced Mar 2, 2023
Merged
Merged
@trop
Copy link
Contributor

trop bot commented Mar 2, 2023

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

@trop trop bot added the in-flight/23-x-y label Mar 2, 2023
@trop
Copy link
Contributor

trop bot commented Mar 2, 2023

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

@trop trop bot added in-flight/24-x-y merged/24-x-y PR was merged to the "24-x-y" branch merged/23-x-y PR was merged to the "23-x-y" branch. and removed target/23-x-y PR should also be added to the "23-x-y" branch. target/24-x-y PR should also be added to the "24-x-y" branch. in-flight/24-x-y labels Mar 2, 2023
@devinbinnie devinbinnie mentioned this pull request Mar 3, 2023
Merged
@commit-lint commit-lint bot mentioned this pull request May 30, 2023
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@VerteDinde VerteDinde VerteDinde approved these changes

@MarshallOfSound MarshallOfSound MarshallOfSound approved these changes

Assignees
No one assigned
Labels
merged/23-x-y PR was merged to the "23-x-y" branch. merged/24-x-y PR was merged to the "24-x-y" branch new-pr 🌱 PR opened in the last 24 hours semver/patch backwards-compatible bug fixes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Bug]: Frameless window is not draggable when running MAS build
3 participants
@nornagon @VerteDinde @MarshallOfSound