fixed: ceiling the sizing width caused subtle issues with CPTextView

This commit is contained in:
daboe01 committed 2016-11-15 22:43:24 +01:00
1 parent 66c9a1e90a
commit 80d1e9a9a7
2 files changed
+9 -4

No files matched your search

+8 -2
View File
@@ -68,7 +68,7 @@ CPStringSizeCachingEnabled = YES;
#endif
}
- (CGSize)sizeWithFont:(CPFont)aFont inWidth:(float)aWidth
- (CGSize)_sizeWithFont:(CPFont)aFont inWidth:(float)aWidth
{
var size;
@@ -101,7 +101,7 @@ CPStringSizeCachingEnabled = YES;
if (fontHeight === undefined)
fontHeight = CPStringSizeWithFontHeightCache[cssString] = [aFont defaultLineHeightForFont];
size = CGSizeMake(CEIL(CPStringSizeMeasuringContext.measureText(self).width), fontHeight);
size = CGSizeMake(CPStringSizeMeasuringContext.measureText(self).width, fontHeight);
}
sizeCacheForFont[cacheKey] = size;
@@ -111,4 +111,10 @@ CPStringSizeCachingEnabled = YES;
return CGSizeMakeCopy(size);
}
- (CGSize)sizeWithFont:(CPFont)aFont inWidth:(float)aWidth
{
var size = [self _sizeWithFont:aFont inWidth:aWidth];
return CGSizeMake(CEIL(size.width), size.height);
}
@end
+1 -2
View File
@@ -1,4 +1,3 @@
/*
* CPTypesetter.j
* AppKit
@@ -319,7 +318,7 @@ var CPSystemTypesetterFactory,
measuringRange.length++;
var currentCharCode = theString.charCodeAt(glyphIndex), // use pure javascript methods for performance reasons
rangeWidth = [theString.substr(measuringRange.location, measuringRange.length) sizeWithFont:currentFont inWidth:NULL].width + currentAnchor;
rangeWidth = [theString.substr(measuringRange.location, measuringRange.length) _sizeWithFont:currentFont inWidth:NULL].width + currentAnchor;
switch (currentCharCode) // faster than sending actionForControlCharacterAtIndex: called for each char.
{