[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kdeui/icons
From:       James Richard Tyrer <tyrerj () acm ! org>
Date:       2007-06-21 11:26:33
Message-ID: 1182425193.111228.21419.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 678429 by tyrerj:

port of fix for bug 53052 from the 3.5 BRANCH

 M  +5 -11     kiconloader.cpp  


--- trunk/KDE/kdelibs/kdeui/icons/kiconloader.cpp #678428:678429
@@ -458,19 +458,17 @@
 
     const char * const ext[4] = { ".png", ".svgz", ".svg", ".xpm" };
 
-    /* antlarr: Multiple inheritance is a broken concept on icon themes, so
-       the next code doesn't support it on purpose because in fact, it was
-       never supported at all. This makes the order in which we look for an
-       icon as:
+   /* JRT: To follow the XDG spec, the order in which we look for an
+       icon 1s:
 
        png, svgz, svg, xpm exact match
+       png, svgz, svg, xpm best match
        next theme in inheritance tree : png, svgz, svg, xpm exact match
+                                        png, svgz, svg, xpm best match
        next theme in inheritance tree : png, svgz, svg, xpm exact match
+                                        png, svgz, svg, xpm best match
        and so on
 
-       And if the icon couldn't be found then it tries best match in the same
-       order.
-
        */
     foreach(KIconThemeNode *themeNode, d->links)
     {
@@ -481,10 +479,6 @@
 		return icon;
 	}
 
-    }
-
-    foreach(KIconThemeNode *themeNode, d->links)
-    {
 	for (int i = 0 ; i < 4 ; i++)
 	{
 	    icon = themeNode->theme->iconPath(name + ext[i], size, K3Icon::MatchBest);
[prev in list] [next in list] [prev in thread] [next in thread]