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: rounded corners on vibrant macOS modals #39998

Merged
merged 4 commits into from
Sep 28, 2023
Merged

fix: rounded corners on vibrant macOS modals #39998

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1b5417a
fix: rounded corners on vibrant macOS modals
trop[bot] Sep 27, 2023
f8af90b
Update shell/browser/native_window_mac.mm
codebytere Sep 28, 2023
8823015
Update shell/browser/native_window_mac.mm
codebytere Sep 28, 2023
bc09d8a
Update shell/browser/native_window_mac.mm
codebytere Sep 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 10 additions & 2 deletions shell/browser/native_window_mac.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1425,11 +1425,19 @@ void ReorderChildWindowAbove(NSWindow* child_window, NSWindow* other_window) {

if (vibrantView != nil && !vibrancy_type_.empty()) {
const bool no_rounded_corner = !HasStyleMask(NSWindowStyleMaskTitled);
if (!has_frame() && !is_modal() && !no_rounded_corner) {
// Modal window corners are rounded on macOS >= 11 or higher if the user
// hasn't passed noRoundedCorners.
bool should_round_modal =
!no_rounded_corner && (base::mac::IsAtLeastOS11() ? true : !is_modal());
// Nonmodal window corners are rounded if they're frameless and the user
// hasn't passed noRoundedCorners.
bool should_round_nonmodal = !no_rounded_corner && !has_frame();

if (should_round_nonmodal || should_round_modal) {
CGFloat radius;
if (fullscreen) {
radius = 0.0f;
} else if (@available(macOS 11.0, *)) {
} else if (base::mac::IsAtLeastOS11()) {
radius = 9.0f;
} else {
// Smaller corner radius on versions prior to Big Sur.
Expand Down