compromise for the new busy indicator:

old explosion + new highlight = exploding highlight ;)

1 files changed, 38 insertions, 12 deletions

diff --git a/core/launcher/launcherview.cpp b/core/launcher/launcherview.cpp
index c2bde53..9f86136 100644
--- a/core/launcher/launcherview.cpp
+++ b/core/launcher/launcherview.cpp
@@ -66,8 +66,9 @@ public:
     {
         sortmeth = Name;
         hidden.setAutoDelete(TRUE);
         ike = FALSE;
+        busytimer = 0;
         calculateGrid( Bottom );
     }
 
     ~LauncherIconView()
@@ -96,10 +97,27 @@ public:
     void setBusy(bool on)
     {
         QIconViewItem *c = on ? currentItem() : 0;
         if ( bsy != c ) {
-            if ( c ) {
-                QPixmap *src = c->pixmap();
+            if ( bsy )
+                bsy-> repaint ( );
+            bsy = c;
+        
+            if ( bsy ) {
+                    busytimer = startTimer ( 150 );
+                    busystate = 50;
+                    startTimer ( 0 );
+            }
+            else
+                killTimer ( busytimer );
+        }
+    }
+
+    virtual void timerEvent ( QTimerEvent *te )
+    {
+        if ( !te || ( te-> timerId ( ) == busytimer )) {
+            if ( bsy ) {
+                QPixmap *src = bsy-> QIconViewItem::pixmap();
                 QImage img = src->convertToImage();
                 QRgb* rgb;
                 int count;
                 if ( img.depth() == 32 ) {
@@ -109,24 +127,30 @@ public:
                     rgb = img.colorTable();
                     count = img.numColors();
                 }
                 int rc, gc, bc;
+                int bs = ::abs ( busystate ) + 25;
                 colorGroup().highlight().rgb( &rc, &gc, &bc );
-                int ri, gi, bi;
+                rc = rc * bs / 100;
+                gc = gc * bs / 100;
+                bc = bc * bs / 100;
+                
                 for ( int r = 0; r < count; r++, rgb++ ) {
-                    int ri = (rc+qRed(*rgb))/2;
-                    int gi = (gc+qGreen(*rgb))/2;
-                    int bi = (bc+qBlue(*rgb))/2;
-                    int ai = qAlpha(*rgb);
-                    *rgb = qRgba(ri,gi,bi,ai);
+                    int ri = rc + qRed   ( *rgb ) * ( 100 - bs ) / 100;
+                    int gi = gc + qGreen ( *rgb ) * ( 100 - bs ) / 100;
+                    int bi = bc + qBlue  ( *rgb ) * ( 100 - bs ) / 100;
+                    int ai = qAlpha ( *rgb );
+                    *rgb = qRgba ( ri, gi, bi, ai );
                 }
 
                 bpm.convertFromImage( img );
+                
+                bsy-> repaint ( );
+
+                busystate += 10;
+                if ( busystate > 50 )
+                        busystate = -40;
             }
-            QIconViewItem* o = bsy;
-            bsy = c;
-            if ( o ) o->repaint();
-            if ( c ) c->repaint();
         }
     }
 
     bool inKeyEvent() const { return ike; }
@@ -286,8 +310,10 @@ private:
     bool bigIcns;
     QPixmap bgPixmap;
     QPixmap bpm;
     QColor bgColor;
+    int busytimer;
+    int busystate;
 };
 
 
 bool LauncherView::bsy=FALSE;