Commit: 9366a1ec508bb2f45604d5212c0709f88caeca2e - textmate (git)

TextMate is a graphical text editor for OS X 10.7+

Commit MetaInfo

• Revision: 9366a1ec508bb2f45604d5212c0709f88caeca2e (tree)
• Zeit: 2012-08-19 21:44:57
• Autor: Allan Odgaard <git@abet...>
• Commiter: Allan Odgaard

Log Message

Cache image resources

This was also done prior to commit 806cb44. I just assumed that now that we are back using the system’s named image stuff, we would benefit from their cache, but clearly we are not (especially file browser seemed sluggish because of (re)loading the file type images).

Ändern Zusammenfassung

• modified: Frameworks/OakAppKit/src/NSImage Additions.mm

Diff

--- a/Frameworks/OakAppKit/src/NSImage Additions.mm	
+++ b/Frameworks/OakAppKit/src/NSImage Additions.mm	
@@ -3,7 +3,23 @@
 @implementation NSImage (ImageFromBundle)
 + (NSImage*)imageNamed:(NSString*)aName inSameBundleAsClass:(id)aClass
 {
-	return [[NSBundle bundleForClass:aClass] imageForResource:aName];
+	if(!aName)
+		return nil;
+
+	NSBundle* bundle = [NSBundle bundleForClass:aClass];
+	NSString* name   = [NSString stringWithFormat:@"%@.%@", [bundle bundleIdentifier], aName];
+
+	static NSMutableDictionary* cache = [NSMutableDictionary new];
+	if(NSImage* res = [cache objectForKey:name])
+		return res;
+
+	if(NSImage* image = [[NSBundle bundleForClass:aClass] imageForResource:aName])
+	{
+		[cache setObject:image forKey:name];
+		return image;
+	}
+
+	return nil;
 }
 
 // ===================================================