Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 49 additions & 28 deletions src/gui/macOS/trayaccountpopup/trayaccountpopupviewutils.mm
Original file line number Diff line number Diff line change
Expand Up @@ -85,38 +85,59 @@ void setSharedToolTip(NSString *toolTip, NSArray *views)
panel.backgroundColor = NSColor.clearColor;
panel.opaque = NO;

auto container = [[[NSView alloc] init] autorelease];
container.wantsLayer = YES;
container.layer.cornerRadius = kCornerRadius;
container.layer.masksToBounds = YES;
panel.contentView = container;

auto visualEffectView = [[[NSVisualEffectView alloc] init] autorelease];
visualEffectView.material = NSVisualEffectMaterialHUDWindow;
visualEffectView.blendingMode = NSVisualEffectBlendingModeBehindWindow;
visualEffectView.state = NSVisualEffectStateActive;
visualEffectView.wantsLayer = YES;
visualEffectView.layer.cornerRadius = kCornerRadius;
visualEffectView.layer.masksToBounds = YES;
visualEffectView.translatesAutoresizingMaskIntoConstraints = NO;
[container addSubview:visualEffectView];

auto stack = [NSStackView stackViewWithViews:@[]];
stack.orientation = NSUserInterfaceLayoutOrientationVertical;
stack.spacing = 0;
stack.translatesAutoresizingMaskIntoConstraints = NO;
[visualEffectView addSubview:stack];

[NSLayoutConstraint activateConstraints:@[
[visualEffectView.topAnchor constraintEqualToAnchor:container.topAnchor],
[visualEffectView.leadingAnchor constraintEqualToAnchor:container.leadingAnchor],
[visualEffectView.trailingAnchor constraintEqualToAnchor:container.trailingAnchor],
[visualEffectView.bottomAnchor constraintEqualToAnchor:container.bottomAnchor],
[stack.topAnchor constraintEqualToAnchor:visualEffectView.topAnchor],
[stack.leadingAnchor constraintEqualToAnchor:visualEffectView.leadingAnchor],
[stack.trailingAnchor constraintEqualToAnchor:visualEffectView.trailingAnchor],
[stack.bottomAnchor constraintEqualToAnchor:visualEffectView.bottomAnchor],
]];

if (@available(macOS 26.0, *)) {
auto container = [[[NSView alloc] init] autorelease];
container.wantsLayer = YES;
container.layer.cornerRadius = kCornerRadius;
container.layer.masksToBounds = YES;
panel.contentView = container;

auto glassEffectView = [[[NSGlassEffectView alloc] init] autorelease];
glassEffectView.cornerRadius = kCornerRadius;
glassEffectView.contentView = stack;
glassEffectView.translatesAutoresizingMaskIntoConstraints = NO;
[container addSubview:glassEffectView];

[NSLayoutConstraint activateConstraints:@[
[glassEffectView.topAnchor constraintEqualToAnchor:container.topAnchor],
[glassEffectView.leadingAnchor constraintEqualToAnchor:container.leadingAnchor],
[glassEffectView.trailingAnchor constraintEqualToAnchor:container.trailingAnchor],
[glassEffectView.bottomAnchor constraintEqualToAnchor:container.bottomAnchor],
]];
} else {
auto container = [[[NSView alloc] init] autorelease];
container.wantsLayer = YES;
container.layer.cornerRadius = kCornerRadius;
container.layer.masksToBounds = YES;
panel.contentView = container;

auto visualEffectView = [[[NSVisualEffectView alloc] init] autorelease];
visualEffectView.material = NSVisualEffectMaterialMenu;
visualEffectView.blendingMode = NSVisualEffectBlendingModeBehindWindow;
visualEffectView.state = NSVisualEffectStateActive;
visualEffectView.wantsLayer = YES;
visualEffectView.layer.cornerRadius = kCornerRadius;
visualEffectView.layer.masksToBounds = YES;
visualEffectView.translatesAutoresizingMaskIntoConstraints = NO;
[container addSubview:visualEffectView];
[visualEffectView addSubview:stack];

[NSLayoutConstraint activateConstraints:@[
[visualEffectView.topAnchor constraintEqualToAnchor:container.topAnchor],
[visualEffectView.leadingAnchor constraintEqualToAnchor:container.leadingAnchor],
[visualEffectView.trailingAnchor constraintEqualToAnchor:container.trailingAnchor],
[visualEffectView.bottomAnchor constraintEqualToAnchor:container.bottomAnchor],
[stack.topAnchor constraintEqualToAnchor:visualEffectView.topAnchor],
[stack.leadingAnchor constraintEqualToAnchor:visualEffectView.leadingAnchor],
[stack.trailingAnchor constraintEqualToAnchor:visualEffectView.trailingAnchor],
[stack.bottomAnchor constraintEqualToAnchor:visualEffectView.bottomAnchor],
]];
}

return stack;
}
Expand Down
Loading