Skip to content

Fix rendering without hosting view on macOS #492

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

Open
vladborovtsov wants to merge 1 commit into
base: release-2.4
Choose a base branch
from
Open

Fix rendering without hosting view on macOS #492

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 10 additions & 4 deletions framework/Source/CPTLayer.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,23 +330,29 @@ -(void)display

if ( [NSView instancesRespondToSelector:@selector(effectiveAppearance)] ) {
CPTGraphHostingView *hostingView = [self findHostingView];
if ( [NSAppearance instancesRespondToSelector:@selector(performAsCurrentDrawingAppearance:)] ) {
NSAppearance *appearance = hostingView.effectiveAppearance;

if ( appearance && [NSAppearance instancesRespondToSelector:@selector(performAsCurrentDrawingAppearance:)] ) {
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wunguarded-availability-new"
[hostingView.effectiveAppearance performAsCurrentDrawingAppearance: ^{
[appearance performAsCurrentDrawingAppearance: ^{
[super display];
}];
#pragma clang diagnostic pop
}
else {
else if ( appearance ) {
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
NSAppearance *oldAppearance = NSAppearance.currentAppearance;
NSAppearance.currentAppearance = hostingView.effectiveAppearance;
NSAppearance.currentAppearance = appearance;
[super display];
NSAppearance.currentAppearance = oldAppearance;
#pragma clang diagnostic pop
}
else {
// No hosting view; fall back to the default rendering path so the layer still draws.
[super display];
}
}
else {
[super display];
Expand Down