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

Use OakAttributedStringForEventString in bundle item chooser

Browse Source
This commit is contained in:
Allan Odgaard
2014-11-14 10:24:25 +01:00
parent 12013fef38
commit 500ec62321
1 changed files with 1 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Frameworks/OakFilterList/src/BundleItemChooser.mm
View File

@@ -219,31 +219,7 @@ static std::vector<bundles::item_ptr> relevant_items_in_scope (scope::context_t
if(NSString* keyEquivalent = item[@"keyEquivalent"])
{
self.shortcutTextField.font = [NSFont controlContentFontOfSize:0];
size_t keyStartsAt = 0;
std::string const glyphString = ns::glyphs_for_event_string(to_s(keyEquivalent), &keyStartsAt);
NSString* modifiers = [NSString stringWithCxxString:glyphString.substr(0, keyStartsAt)];
NSString* key = [NSString stringWithCxxString:glyphString.substr(keyStartsAt)];
NSDictionary* fontAttr = @{ NSFontAttributeName : self.shortcutTextField.font };
CGFloat curWidth = std::max<CGFloat>(1, [key sizeWithAttributes:fontAttr].width);
CGFloat maxWidth = std::max<CGFloat>(1, [@"⌫" sizeWithAttributes:fontAttr].width);
if(curWidth < maxWidth)
{
CGFloat width = std::max<CGFloat>(1, [modifiers sizeWithAttributes:fontAttr].width);
NSMutableAttributedString* aStr = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"%@%@\t", modifiers, key] attributes:fontAttr];
NSMutableParagraphStyle* pStyle = [NSMutableParagraphStyle new];
[pStyle setTabStops:@[ [[NSTextTab alloc] initWithType:NSLeftTabStopType location:width + maxWidth] ]];
[aStr addAttributes:@{ NSParagraphStyleAttributeName : pStyle } range:NSMakeRange(0, [aStr length])];
str = aStr;
}
else
{
str = [modifiers stringByAppendingString:key];
}
str = OakAttributedStringForEventString(keyEquivalent, self.shortcutTextField.font);
}
else if(NSString* tabTrigger = item[@"tabTrigger"])
{