-rw-r--r-- | core/launcher/launcherview.cpp | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/core/launcher/launcherview.cpp b/core/launcher/launcherview.cpp index dbcb0d7..5daaeff 100644 --- a/core/launcher/launcherview.cpp +++ b/core/launcher/launcherview.cpp @@ -80,13 +80,13 @@ public: ++it; //qDebug("%p: hidden (should remove)",l); } #endif } - QPixmap* busyPixmap() const { return (QPixmap*)&bpm; } + QPixmap* busyPixmap() const { return (QPixmap*)&bpm[::abs(busystate)]; } QIconViewItem* busyItem() const { return bsy; } void setBigIcons( bool bi ) { bigIcns = bi; } void updateCategoriesAndMimeTypes(); void doAutoScroll() @@ -100,40 +100,41 @@ public: if ( bsy != c ) { if ( bsy ) bsy-> repaint ( ); bsy = c; if ( bsy ) { + busystate = 5; + for ( int i = 0; i <= 5; i++ ) + bpm [i] = QPixmap ( ); + timerEvent ( 0 ); busytimer = startTimer ( 150 ); - busystate = 50; - // not sure what this startTimer is for, maybe i am just to tired. But - // currently that causes 100% cpuload on app launch - //startTimer ( 0 ); } else killTimer ( busytimer ); } } virtual void timerEvent ( QTimerEvent *te ) { if ( !te || ( te-> timerId ( ) == busytimer )) { if ( bsy ) { + if ( bpm [::abs(busystate)]. isNull ( )) { QPixmap *src = bsy-> QIconViewItem::pixmap(); QImage img = src->convertToImage(); QRgb* rgb; int count; if ( img.depth() == 32 ) { rgb = (QRgb*)img.bits(); count = img.bytesPerLine()/sizeof(QRgb)*img.height(); } else { rgb = img.colorTable(); count = img.numColors(); } int rc, gc, bc; - int bs = ::abs ( busystate ) + 25; + int bs = ::abs ( busystate * 10 ) + 25; colorGroup().highlight().rgb( &rc, &gc, &bc ); rc = rc * bs / 100; gc = gc * bs / 100; bc = bc * bs / 100; for ( int r = 0; r < count; r++, rgb++ ) { @@ -141,19 +142,19 @@ public: 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 ); - + bpm [::abs(busystate)].convertFromImage( img ); + } bsy-> repaint ( ); - busystate += 10; - if ( busystate > 50 ) - busystate = -40; + busystate++; + if ( busystate > 5 ) + busystate = -4; } } } bool inKeyEvent() const { return ike; } void keyPressEvent(QKeyEvent* e) @@ -308,13 +309,13 @@ private: QRegExp tf; int cf; QIconViewItem* bsy; bool ike; bool bigIcns; QPixmap bgPixmap; - QPixmap bpm; + QPixmap bpm [6]; QColor bgColor; int busytimer; int busystate; }; |