Skip to content

fix: min/max width/height enforcement when aspectRatio is set#37306

Merged
jkleinsc merged 1 commit intomainfrom
fix-aspect-ratio-enforcement
Mar 1, 2023
Merged

fix: min/max width/height enforcement when aspectRatio is set#37306
jkleinsc merged 1 commit intomainfrom
fix-aspect-ratio-enforcement

Conversation

@codebytere
Copy link
Member

@codebytere codebytere commented Feb 16, 2023 •
edited
Loading

Description of Change

Closes #37305.

Fixes an issue where minWidth/minHeight and maxWidth/maxHeight would not be enforced if the user set an aspectRatio on macOS. This was happening because we were explicitly setting the new width and height in windowWillResize, which overrides the handling macOS sets on the updated frame when setContentMinSize and setContentMaxSize were previously called on the NSWindow.

cc @carterbs

Checklist

Release Notes

Notes: Fixes an issue where minWidth/minHeight and maxWidth/maxHeight would not be enforced if the user set an aspectRatio on macOS.

@codebytere codebytere added 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 Feb 16, 2023
@electron-cation electron-cation bot added the new-pr 🌱 PR opened recently label Feb 16, 2023
@codebytere codebytere force-pushed the fix-aspect-ratio-enforcement branch 4 times, most recently from a0ad7e1 to a5c4c66 Compare February 16, 2023 14:30
@codebytere codebytere added the semver/patch backwards-compatible bug fixes label Feb 16, 2023
@codebytere codebytere force-pushed the fix-aspect-ratio-enforcement branch from a5c4c66 to 39d4197 Compare February 16, 2023 14:42
@codebytere codebytere marked this pull request as ready for review February 16, 2023 14:42
@codebytere codebytere force-pushed the fix-aspect-ratio-enforcement branch from 39d4197 to f189da4 Compare February 16, 2023 14:45
@codebytere codebytere added the target/22-x-y PR should also be added to the "22-x-y" branch. label Feb 16, 2023
carterbs
carterbs reviewed Feb 16, 2023
View reviewed changes
@electron-cation electron-cation bot removed the new-pr 🌱 PR opened recently label Feb 17, 2023
jkleinsc
jkleinsc reviewed Mar 1, 2023
View reviewed changes
Copy link
Member

@jkleinsc jkleinsc left a comment

Choose a reason for hiding this comment

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

Change looks good to me, but can we add test(s)?

@jkleinsc jkleinsc merged commit 8f2917d into main Mar 1, 2023
@jkleinsc jkleinsc deleted the fix-aspect-ratio-enforcement branch March 1, 2023 15:50
@release-clerk
Copy link

release-clerk bot commented Mar 1, 2023

Release Notes Persisted

Fixes an issue where minWidth/minHeight and maxWidth/maxHeight would not be enforced if the user set an aspectRatio on macOS.

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

trop bot commented Mar 1, 2023

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

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

trop bot commented Mar 1, 2023

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

@trop
Copy link
Contributor

trop bot commented Mar 1, 2023

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

@trop trop bot added in-flight/23-x-y merged/22-x-y PR was merged to the "22-x-y" branch. 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 and removed target/24-x-y PR should also be added to the "24-x-y" branch. target/23-x-y PR should also be added to the "23-x-y" branch. target/22-x-y PR should also be added to the "22-x-y" branch. in-flight/22-x-y labels Mar 1, 2023
@commit-lint commit-lint bot mentioned this pull request May 25, 2023
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jkleinsc jkleinsc jkleinsc approved these changes

@deepak1556 deepak1556 Awaiting requested review from deepak1556

@VerteDinde VerteDinde Awaiting requested review from VerteDinde

@MarshallOfSound MarshallOfSound Awaiting requested review from MarshallOfSound

+2 more reviewers

@carterbs carterbs carterbs left review comments

@zcbenz zcbenz zcbenz approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

merged/22-x-y PR was merged to the "22-x-y" branch. 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 semver/patch backwards-compatible bug fixes

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

[Bug]: Aspect Ratio locking and MinHeight/Width appear incompatible

4 participants

@codebytere @jkleinsc @zcbenz @carterbs