Changeset 11070

Timestamp:

Jul 30, 2010, 10:23:47 PM (12 years ago)

Author:

charles

Message:

(trunk qt) 1. fix icon sizing issue. 2. add a mechanism to get the favicon from the hostname as an alternative to passing in the full announce UR.L

Location:

trunk/qt

Files:

• favicon.cc (modified) (2 diffs)
• favicon.h (modified) (1 diff)

trunk/qt/favicon.cc

@@ -83 +83 @@
 Favicons :: find( const QUrl& url )
 {
+    return findFromHost( getHost( url ) );
+}
+
+namespace
+{
+    const QSize rightSize( 16, 16 );
+};
+
+QPixmap
+Favicons :: findFromHost( const QString& host )
+{
     ensureCacheDirHasBeenScanned( );
 
-    return myPixmaps[ getHost(url) ];
+    const QPixmap pixmap = myPixmaps[ host ];
+    return pixmap.size()==rightSize ? pixmap : pixmap.scaled(rightSize);
 }
 
@@ -98 +110 @@
     {
         // add a placholder s.t. we only ping the server once per session
-        QPixmap tmp( 16, 16 );
+        QPixmap tmp( rightSize );
         tmp.fill( Qt::transparent );
         myPixmaps.insert( host, tmp );

trunk/qt/favicon.h

@@ -39 +39 @@
         QPixmap find( const QUrl& url );
 
+        /* returns a cached pixmap, or a NULL pixmap if there's no match in the cache */
+        QPixmap findFromHost( const QString& host );
+
         /* this will emit a signal when (if) the icon becomes ready */
         void add( const QUrl& url );