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

Missing files still get SCM badge

Browse Source
This commit is contained in:
Allan Odgaard
2013-02-04 19:38:32 +01:00
parent 748558c5d3
commit e42d84fa4c
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Frameworks/OakAppKit/src/OakFileIconImage.mm
View File

@@ -116,11 +116,11 @@ static NSImage* BadgeForSCMStatus (scm::status::type scmStatus)
{
if(!_imageStack)
{
NSMutableArray* res = [NSMutableArray array];
_imageStack = [res retain];
if(_path && _exists)
{
NSMutableArray* res = [NSMutableArray array];
_imageStack = [res retain];
if(!_directory)
{
if(NSImage* customImage = CustomIconForPath(_path))
@@ -143,15 +143,14 @@ static NSImage* BadgeForSCMStatus (scm::status::type scmStatus)
if(image)
[res addObject:image];
}
if(NSImage* scmStatusImage = BadgeForSCMStatus(_scmStatus))
[res addObject:scmStatusImage];
}
else
{
NSArray* res = @[ SystemIconForHFSType(kUnknownFSObjectIcon) ];
_imageStack = [res retain];
[res addObject:SystemIconForHFSType(kUnknownFSObjectIcon)];
}
if(NSImage* scmStatusImage = BadgeForSCMStatus(_scmStatus))
[res addObject:scmStatusImage];
}
return _imageStack;
}
@@ -225,10 +224,10 @@ static NSImage* BadgeForSCMStatus (scm::status::type scmStatus)
self.exists = YES;
self.directory = S_ISDIR(buf.st_mode);
self.alias = S_ISLNK(buf.st_mode);
if(auto scmDriver = scm::ng::info(path::parent(path)))
self.scmStatus = scmDriver->status(path);
}
if(auto scmDriver = scm::ng::info(path::parent(path)))
self.scmStatus = scmDriver->status(path);
}
}
return self;