Skip to content

Commit

Permalink
Use triangular bullet (‣) instead of black small triangle (▸)
Browse files Browse the repository at this point in the history
We were already using the triangular bullet in a few places, so I made it consistent. Semantically the small triangle might be more appropriate, because we do not use the glyph as a point marker, but I think the triangular bullet aligns better with the text (it’s raised above the baseline where the triangle seems to just touch the baseline).
  • Loading branch information
sorbits committed Sep 12, 2017
1 parent 212ef9b commit f30ce91
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Frameworks/Find/src/FFResultNode.mm
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ void append (NSString* str, NSDictionary* attrs = nil, NSFontTraitMask fontTrait
NSFontAttributeName : font,
NSForegroundColorAttributeName : [NSColor darkGrayColor]
});
builder.append(to_ns(text::join(std::vector<std::string>(components.begin(), components.end()), " ")));
builder.append(to_ns(text::join(std::vector<std::string>(components.begin(), components.end()), " ")));
builder.append(to_ns((path::is_absolute(path) ? path::display_name(path) : path)), NSBoldFontMask);
return builder.attributed_string();
}
Expand Down
14 changes: 7 additions & 7 deletions Frameworks/OakFilterList/src/BundleItemChooser.mm
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ _OutputIter copy_menu_items (NSMenu* menu, _OutputIter out, NSArray* parentNames
title = [title stringByAppendingString:@" (•)"];
else title = [title stringByAppendingString:@" (✓)"];
}
*out++ = { to_s(title), to_s([parentNames componentsJoinedByString:@" "]), item };
*out++ = { to_s(title), to_s([parentNames componentsJoinedByString:@" "]), item };
}
}

Expand Down Expand Up @@ -757,9 +757,9 @@ - (NSView*)tableView:(NSTableView*)aTableView viewForTableColumn:(NSTableColumn*
{
std::string suffix;
if(bundleItem->kind() == bundles::kItemTypeGrammar)
suffix = " Language Grammars";
suffix = " Language Grammars";
else if(bundleItem->kind() == bundles::kItemTypeTheme)
suffix = " Themes";
suffix = " Themes";

ActionItem* item = [[ActionItem alloc] init];
item.itemName = to_ns(name);
Expand All @@ -783,7 +783,7 @@ - (NSView*)tableView:(NSTableView*)aTableView viewForTableColumn:(NSTableColumn*
ActionItem* item = [[ActionItem alloc] init];
item.itemName = to_ns(pair.first);
item.value = to_ns(format(pair.second));
item.location = to_ns(path + " " + name);
item.location = to_ns(path + " " + name);
item.uuid = uuid;
item.eclipsed = !self.searchAllScopes && !previousSettings.insert(pair.first).second ? YES : NO;
item.scopeSelector = to_ns(to_s(bundleItem->scope_selector()));
Expand All @@ -805,7 +805,7 @@ - (NSView*)tableView:(NSTableView*)aTableView viewForTableColumn:(NSTableColumn*
ActionItem* item = [[ActionItem alloc] init];
item.itemName = to_ns(pair.first);
item.value = to_ns(format(pair.second));
item.location = to_ns(path + " " + name + " " + "shellVariables");
item.location = to_ns(path + " " + name + " " + "shellVariables");
item.uuid = uuid;
item.eclipsed = eclipsed;
item.scopeSelector = to_ns(to_s(bundleItem->scope_selector()));
Expand Down Expand Up @@ -852,7 +852,7 @@ - (NSView*)tableView:(NSTableView*)aTableView viewForTableColumn:(NSTableColumn*
std::set<std::string> keysSeen;
for(auto const& path : KeyBindingLocations)
{
std::string displayPath = path::is_child(path, oak::application_t::path()) ? "TextMate.app " + path::name(path) : path::with_tilde(path);
std::string displayPath = path::is_child(path, oak::application_t::path()) ? "TextMate.app " + path::name(path) : path::with_tilde(path);
for(auto const& pair : plist::load(path))
{
std::string key = ns::normalize_event_string(pair.first);
Expand Down Expand Up @@ -892,7 +892,7 @@ - (NSView*)tableView:(NSTableView*)aTableView viewForTableColumn:(NSTableColumn*
for(auto const& info : settings_info_for_path(to_s(self.path), self.searchAllScopes ? scope::wildcard : self.scope.right, to_s(self.directory)))
{
std::string const name = info.variable;
std::string const path = info.path == NULL_STR ? "TextMate.app Preferences" : (path::is_child(info.path, oak::application_t::path()) ? "TextMate.app " + path::name(info.path) : path::with_tilde(info.path)) + (info.section == NULL_STR ? "" : " " + info.section);
std::string const path = info.path == NULL_STR ? "TextMate.app Preferences" : (path::is_child(info.path, oak::application_t::path()) ? "TextMate.app " + path::name(info.path) : path::with_tilde(info.path)) + (info.section == NULL_STR ? "" : " " + info.section);

ActionItem* item = [[ActionItem alloc] init];
item.itemName = to_ns(name);
Expand Down
2 changes: 1 addition & 1 deletion Frameworks/bundles/src/query.cc
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ namespace bundles
std::deque<std::string> path;
while(item = lookup(item->parent_menu()))
path.push_front(item->name());
return text::join(path, " ");
return text::join(path, " ");
}

std::string key_equivalent (item_ptr const& item)
Expand Down

0 comments on commit f30ce91

Please sign in to comment.