averello/macvim-mirror
1
0
Fork 0
mirror of https://github.com/macvim-dev/macvim.git synced 2026-06-11 15:37:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

-[MMCoreTextView initWithFrame:] doesn't initialize fontDescent

Browse Source 
Fixes #883.
This commit is contained in:
Jiang Jiang
2019-07-28 10:11:13 -07:00
parent f8bd61bd41
commit 92dd6bacc7
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/MacVim/MMCoreTextView.m
+4 -8
View File
@@ -150,6 +150,7 @@ defaultAdvanceForFont(NSFont *font)
// NOTE! It does not matter which font is set here, Vim will set its
// own font on startup anyway. Just set some bogus values.
font = [[NSFont userFixedPitchFontOfSize:0] retain];
fontDescent = ceil(CTFontGetDescent((CTFontRef)font));
cellSize.width = cellSize.height = 1;
// NOTE: If the default changes to 'NO' then the intialization of
@@ -301,18 +302,13 @@ defaultAdvanceForFont(NSFont *font)
- (void)setFont:(NSFont *)newFont
{
if (!(newFont && font != newFont))
if (!newFont || [font isEqual:newFont])
return;
double em = round(defaultAdvanceForFont(newFont));
double pt = round([newFont pointSize]);
CTFontDescriptorRef desc = CTFontDescriptorCreateWithNameAndSize((CFStringRef)[newFont fontName], pt);
CTFontRef fontRef = CTFontCreateWithFontDescriptor(desc, pt, NULL);
CFRelease(desc);
[font release];
font = (NSFont*)fontRef;
font = [newFont retain];
float cellWidthMultiplier = [[NSUserDefaults standardUserDefaults]
floatForKey:MMCellWidthMultiplierKey];
@@ -324,7 +320,7 @@ defaultAdvanceForFont(NSFont *font)
cellSize.width = columnspace + ceil(em * cellWidthMultiplier);
cellSize.height = linespace + defaultLineHeightForFont(font);
fontDescent = ceil(CTFontGetDescent(fontRef));
fontDescent = ceil(CTFontGetDescent((CTFontRef)newFont));
[fontCache removeAllObjects];
}