github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-04-28 03:00:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Do not create temporary CTLineRef for lines without tabs

Browse Source 
This also avoids creating the paragraph style object for these lines.
This commit is contained in:
Allan Odgaard
2014-07-29 00:55:38 +02:00
parent 082c665457
commit bb3b997a56
1 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
Frameworks/layout/src/ct.cc
View File

@@ -149,7 +149,7 @@ namespace ct
}
}
CTLineRef tmpLine = CTLineCreateWithAttributedString(toDraw);
_line.reset(CTLineCreateWithAttributedString(toDraw), CFRelease);
CGFloat tabWidth = tabSize * metrics.column_width();
CGFloat standardTabWidths = 0;
CGFloat newTabWidths = 0;
@@ -166,33 +166,36 @@ namespace ct
case '\t':
j += utf16::distance(text.data() + (_tab_locations.empty() ? 0 : _tab_locations.back()), text.data() + i);
CGFloat x = CTLineGetOffsetForStringIndex(tmpLine, j, NULL);
CGFloat x = CTLineGetOffsetForStringIndex(_line.get(), j, NULL);
CGFloat newX = (x - standardTabWidths + newTabWidths);
CGFloat stopLocation = (floor(newX / tabWidth)+1) * tabWidth;
if(stopLocation - newX < metrics.column_width()*0.5)
stopLocation += tabWidth;
newTabWidths += stopLocation - newX;
standardTabWidths += CTLineGetOffsetForStringIndex(tmpLine, j+1, NULL) - x;
standardTabWidths += CTLineGetOffsetForStringIndex(_line.get(), j+1, NULL) - x;
tabs.push_back(CTTextTabCreate(kCTNaturalTextAlignment, stopLocation, NULL));
_tab_locations.push_back(i);
break;
}
}
CFRelease(tmpLine);
CFArrayRef tabStops = CFArrayCreate(kCFAllocatorDefault, (const void**) (&tabs[0]), tabs.size(), &kCFTypeArrayCallBacks);
for(CTTextTabRef t : tabs)
CFRelease(t);
if(!tabs.empty())
{
CFArrayRef tabStops = CFArrayCreate(kCFAllocatorDefault, (const void**) (&tabs[0]), tabs.size(), &kCFTypeArrayCallBacks);
for(CTTextTabRef t : tabs)
CFRelease(t);
CTParagraphStyleSetting settings[] = {
{ kCTParagraphStyleSpecifierTabStops, sizeof(CFArrayRef), &tabStops },
{ kCTParagraphStyleSpecifierDefaultTabInterval, sizeof(tabWidth), &tabWidth }
};
CTParagraphStyleRef paragraphStyle = CTParagraphStyleCreate(settings, sizeofA(settings));
CFAttributedStringSetAttribute(toDraw, CFRangeMake(0, CFAttributedStringGetLength(toDraw)), kCTParagraphStyleAttributeName, paragraphStyle);
CFRelease(paragraphStyle);
CFRelease(tabStops);
_line.reset(CTLineCreateWithAttributedString(toDraw), CFRelease);
}
CTParagraphStyleSetting settings[] = {
{ kCTParagraphStyleSpecifierTabStops, sizeof(CFArrayRef), &tabStops },
{ kCTParagraphStyleSpecifierDefaultTabInterval, sizeof(tabWidth), &tabWidth }
};
CTParagraphStyleRef paragraphStyle = CTParagraphStyleCreate(settings, sizeofA(settings));
CFAttributedStringSetAttribute(toDraw, CFRangeMake(0, CFAttributedStringGetLength(toDraw)), kCTParagraphStyleAttributeName, paragraphStyle);
CFRelease(paragraphStyle);
CFRelease(tabStops);
_line.reset(CTLineCreateWithAttributedString(toDraw), CFRelease);
CFRelease(toDraw);
}
}