Author: rmottola
Date: Mon Apr 18 23:23:56 2016
New Revision: 39680
URL: http://svn.gna.org/viewcvs/gnustep?rev=39680&view=rev
Log:
when caching lik icons, create do it from the full size icon
Modified:
apps/gworkspace/trunk/FSNode/FSNodeRepIcons.m
Modified: apps/gworkspace/trunk/FSNode/FSNodeRepIcons.m
URL:
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/FSNode/FSNodeRepIcons.m?rev=39680&r1=39679&r2=39680&view=diff
==============================================================================
--- apps/gworkspace/trunk/FSNode/FSNodeRepIcons.m (original)
+++ apps/gworkspace/trunk/FSNode/FSNodeRepIcons.m Mon Apr 18 23:23:56 2016
@@ -177,7 +177,7 @@
if ([node isLink])
{
NSImage *linkIcon;
-
+
linkIcon = [NSImage imageNamed:@"common_linkCursor"];
baseIcon = [baseIcon copy];
[baseIcon lockFocus];
@@ -240,16 +240,22 @@
linkKey = [key stringByAppendingString:@"_linked"];
icon = [self cachedIconOfSize: size forKey: linkKey];
}
- if (icon == nil)
- icon = [self cachedIconOfSize: size forKey: key];
-
+ else
+ {
+ icon = [self cachedIconOfSize: size forKey: key];
+ }
+
if (icon == nil)
{
- baseIcon = [ws iconForFile: nodepath];
+ // we look up the cache, but only in the full size to composite
later
+ baseIcon = [self cachedIconOfSize: 48 forKey: key];
+ if (baseIcon == nil)
+ baseIcon = [ws iconForFile: nodepath];
+
if ([node isLink])
{
NSImage *linkIcon;
-
+
linkIcon = [NSImage imageNamed:@"common_linkCursor"];
baseIcon = [baseIcon copy];
[baseIcon lockFocus];
_______________________________________________
Gnustep-cvs mailing list
Gnustep-cvs@gna.org
https://mail.gna.org/listinfo/gnustep-cvs
