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

Don’t show SCM badges for untracked items

Browse Source 
All of these will always have the same badge, so there’s no reason to show it (and it covers the alias badge, so there is some usability benefits beyond just the visuals).
This commit is contained in:
Allan Odgaard
2013-02-11 14:21:21 +01:00
parent 507dac1908
commit 129784816c
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Frameworks/OakFileBrowser/src/io/FSSCMDataSource.mm
View File

@@ -20,7 +20,7 @@ static NSURL* URLAppend (NSURL* base, NSString* relativePath)
return [NSURL URLWithString:[[NSURL URLWithString:relativePath relativeToURL:base] absoluteString]];
}
static NSArray* convert (std::vector<std::string> const& paths, std::string const& wcPath, NSUInteger options)
static NSArray* convert (std::vector<std::string> const& paths, std::string const& wcPath, NSUInteger options, bool hideSCMBadge = false)
{
NSMutableArray* res = [NSMutableArray array];
iterate(path, paths)
@@ -30,6 +30,10 @@ static NSArray* convert (std::vector<std::string> const& paths, std::string cons
item.labelIndex = path::label_index(*path);
item.toolTip = [NSString stringWithCxxString:path::relative_to(*path, wcPath)];
item.leaf = YES;
if(hideSCMBadge)
item.icon.scmStatus = scm::status::none;
[res addObject:item];
}
return [FSDataSource sortArray:res usingOptions:options];
@@ -110,7 +114,7 @@ _Iter prune_path_children (_Iter it, _Iter last)
untrackedItem.icon = SCMFolderIcon();
untrackedItem.name = @"Untracked Items";
untrackedItem.group = YES;
untrackedItem.children = convert(untrackedPaths, scmInfo->root_path(), options);
untrackedItem.children = convert(untrackedPaths, scmInfo->root_path(), options, true);
NSMutableArray* children = [NSMutableArray array];
[children addObject:unstagedItem];