colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-09-13 22:21:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed: text sizing was slower than it should be

Browse Source 
thanks mrcarlberg for spotting this
This commit is contained in:
daboe01
2016-09-01 13:25:12 +02:00
parent 79311d107b
commit ea58d84b55
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/CPStringDrawing.j
+8 -6
View File
@@ -86,18 +86,20 @@ CPStringSizeCachingEnabled = YES;
if (!CPStringSizeCachingEnabled)
return [CPPlatformString sizeOfString:self withFont:aFont forWidth:aWidth];
if (CPStringSizeWithFontInWidthCache[self] === undefined)
CPStringSizeWithFontInWidthCache[self] = [];
var sizeCacheForFont = CPStringSizeWithFontInWidthCache[self];
if (sizeCacheForFont === undefined)
sizeCacheForFont = [];
var cssString = [aFont cssString],
cacheKey = cssString + '_' + aWidth;
size = CPStringSizeWithFontInWidthCache[self][cacheKey];
size = sizeCacheForFont[cacheKey];
if (CPStringSizeWithFontInWidthCache[self].hasOwnProperty(cacheKey) && size !== undefined)
if (size !== undefined && sizeCacheForFont.hasOwnProperty(cacheKey))
return CGSizeMakeCopy(size);
if (!CPStringSizeDidTestCanvasSizingValid)
if (CPStringSizeDidTestCanvasSizingValid === undefined)
{
[self _initializeStringSizing];
CPStringSizeDidTestCanvasSizingValid = YES;
@@ -118,7 +120,7 @@ CPStringSizeCachingEnabled = YES;
size = CGSizeMake(CPStringSizeMeasuringContext.measureText(self).width, fontHeight);
}
CPStringSizeWithFontInWidthCache[self][cacheKey] = size;
sizeCacheForFont[cacheKey] = size;
#else
size = CGSizeMake(0, 0);
#endif