Skip to content

Fix crashing on 10.9 #1268

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

Merged
ychin merged 1 commit into from
Aug 9, 2022
Merged

Fix crashing on 10.9 #1268

Show file tree
Hide file tree
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
5 changes: 5 additions & 0 deletions src/MacVim/MMCoreTextView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -734,7 +734,12 @@ - (void)setNeedsDisplayFromRow:(int)row column:(int)col toRow:(int)row2
- (void)drawRect:(NSRect)rect
{
NSGraphicsContext *context = [NSGraphicsContext currentContext];
#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_10
CGContextRef ctx = context.CGContext;
#else
CGContextRef ctx = [context graphicsPort];
#endif

[context setShouldAntialias:antialias];
{
CGColorSpaceRef colorSpace = CGColorSpaceCreateWithName(kCGColorSpaceSRGB);
Expand Down
2 changes: 1 addition & 1 deletion src/MacVim/MMFullScreenWindow.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ - (NSEdgeInsets) viewOffset {

#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_VERSION_12_0)
// Account for newer MacBook Pro's which have a notch, which can be queried using the safe area API.
if ([NSScreen instancesRespondToSelector:@selector(safeAreaInsets)]) {
if (@available(macos 12.0, *)) {
const int safeAreaBehavior = [[NSUserDefaults standardUserDefaults]
integerForKey:MMNonNativeFullScreenSafeAreaBehaviorKey];

Expand Down
8 changes: 6 additions & 2 deletions src/MacVim/MMWindowController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,8 +571,12 @@ - (void)refreshApperanceMode
// has selected as a preference.

// Transparent title bar setting
decoratedWindow.titlebarAppearsTransparent = [[NSUserDefaults standardUserDefaults]
boolForKey:MMTitlebarAppearsTransparentKey];
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_10
if (@available(macos 10.10, *)) {
decoratedWindow.titlebarAppearsTransparent = [[NSUserDefaults standardUserDefaults]
boolForKey:MMTitlebarAppearsTransparentKey];
}
#endif

// No title bar setting
if ([[NSUserDefaults standardUserDefaults]
Expand Down