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 file browser’s image class for document icons

Browse Source 
On 10.14 the OakFileIconImage has issues (most instances show up as blank).
This commit is contained in:
Allan Odgaard
2018-10-30 16:12:10 +07:00
parent 9b70e273d5
commit 584cadfc17
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Frameworks/document/src/OakDocument.mm
View File

@@ -5,6 +5,7 @@
#import "Printing.h"
#import "watch.h"
#import "merge.h"
#import <FileBrowser/FileItemImage.h>
#import <OakFoundation/OakFoundation.h>
#import <OakFoundation/NSString Additions.h>
#import <OakAppKit/OakEncodingPopUpButton.h>
@@ -175,7 +176,9 @@ NSString* OakDocumentBookmarkIdentifier = @"bookmark";
NSHashTable* _documentEditors;
scm::status::type _scmStatus;
OakFileIconImage* _icon;
NSImage* _icon;
BOOL _iconIsModified;
BOOL _iconIsOnDisk;
NSString* _cachedDisplayName;
std::unique_ptr<ng::buffer_t> _buffer;
@@ -1109,18 +1112,12 @@ NSString* OakDocumentBookmarkIdentifier = @"bookmark";
- (NSImage*)icon
{
// Ideally we would nil the icon in setModified: or setOnDisk: but we don’t implement these
if(_icon && (_icon.isModified != self.isDocumentEdited || _icon.exists != self.isOnDisk))
_icon = nil;
if(!_icon)
if(!_icon || (_iconIsModified != self.isDocumentEdited || _iconIsOnDisk != self.isOnDisk))
{
self.observeSCMStatus = YES;
_icon = [[OakFileIconImage alloc] initWithSize:NSMakeSize(16, 16)];
_icon.path = _virtualPath ?: _path;
_icon.scmStatus = _scmStatus;
_icon.modified = self.isDocumentEdited;
_icon.exists = self.isOnDisk;
_icon = CreateIconImageForURL([NSURL fileURLWithPath:(_virtualPath ?: _path) isDirectory:NO], self.isDocumentEdited, !self.isOnDisk, NO, NO, _scmStatus);
_iconIsModified = self.isDocumentEdited;
_iconIsOnDisk = self.isOnDisk;
}
return _icon;
}

2
Frameworks/document/target
View File

@@ -1,5 +1,5 @@
TESTS = tests/t_*.{mm,cc}
SOURCES = src/*.{mm,cc}
EXPORT = src/OakDocument.h src/OakDocumentController.h src/OakDocumentEditor.h
LINK += BundlesManager OakAppKit OakFoundation OakSystem authorization buffer cf command editor encoding file io layout ns plist regexp scope selection settings text theme undo
LINK += BundlesManager FileBrowser OakAppKit OakFoundation OakSystem authorization buffer cf command editor encoding file io layout ns plist regexp scope selection settings text theme undo
FRAMEWORKS = ApplicationServices