summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/launcherview.cpp71
1 files changed, 36 insertions, 35 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
@@ -85,3 +85,3 @@ public:
85 85
86 QPixmap* busyPixmap() const { return (QPixmap*)&bpm; } 86 QPixmap* busyPixmap() const { return (QPixmap*)&bpm[::abs(busystate)]; }
87 QIconViewItem* busyItem() const { return bsy; } 87 QIconViewItem* busyItem() const { return bsy; }
@@ -105,7 +105,7 @@ public:
105 if ( bsy ) { 105 if ( bsy ) {
106 busystate = 5;
107 for ( int i = 0; i <= 5; i++ )
108 bpm [i] = QPixmap ( );
109 timerEvent ( 0 );
106 busytimer = startTimer ( 150 ); 110 busytimer = startTimer ( 150 );
107 busystate = 50;
108 // not sure what this startTimer is for, maybe i am just to tired. But
109 // currently that causes 100% cpuload on app launch
110 //startTimer ( 0 );
111 } 111 }
@@ -120,35 +120,36 @@ public:
120 if ( bsy ) { 120 if ( bsy ) {
121 QPixmap *src = bsy-> QIconViewItem::pixmap(); 121 if ( bpm [::abs(busystate)]. isNull ( )) {
122 QImage img = src->convertToImage(); 122 QPixmap *src = bsy-> QIconViewItem::pixmap();
123 QRgb* rgb; 123 QImage img = src->convertToImage();
124 int count; 124 QRgb* rgb;
125 if ( img.depth() == 32 ) { 125 int count;
126 rgb = (QRgb*)img.bits(); 126 if ( img.depth() == 32 ) {
127 count = img.bytesPerLine()/sizeof(QRgb)*img.height(); 127 rgb = (QRgb*)img.bits();
128 } else { 128 count = img.bytesPerLine()/sizeof(QRgb)*img.height();
129 rgb = img.colorTable(); 129 } else {
130 count = img.numColors(); 130 rgb = img.colorTable();
131 } 131 count = img.numColors();
132 int rc, gc, bc; 132 }
133 int bs = ::abs ( busystate ) + 25; 133 int rc, gc, bc;
134 colorGroup().highlight().rgb( &rc, &gc, &bc ); 134 int bs = ::abs ( busystate * 10 ) + 25;
135 rc = rc * bs / 100; 135 colorGroup().highlight().rgb( &rc, &gc, &bc );
136 gc = gc * bs / 100; 136 rc = rc * bs / 100;
137 bc = bc * bs / 100; 137 gc = gc * bs / 100;
138 bc = bc * bs / 100;
138 139
139 for ( int r = 0; r < count; r++, rgb++ ) { 140 for ( int r = 0; r < count; r++, rgb++ ) {
140 int ri = rc + qRed ( *rgb ) * ( 100 - bs ) / 100; 141 int ri = rc + qRed ( *rgb ) * ( 100 - bs ) / 100;
141 int gi = gc + qGreen ( *rgb ) * ( 100 - bs ) / 100; 142 int gi = gc + qGreen ( *rgb ) * ( 100 - bs ) / 100;
142 int bi = bc + qBlue ( *rgb ) * ( 100 - bs ) / 100; 143 int bi = bc + qBlue ( *rgb ) * ( 100 - bs ) / 100;
143 int ai = qAlpha ( *rgb ); 144 int ai = qAlpha ( *rgb );
144 *rgb = qRgba ( ri, gi, bi, ai ); 145 *rgb = qRgba ( ri, gi, bi, ai );
146 }
147
148 bpm [::abs(busystate)].convertFromImage( img );
145 } 149 }
146
147 bpm.convertFromImage( img );
148
149 bsy-> repaint ( ); 150 bsy-> repaint ( );
150 151
151 busystate += 10; 152 busystate++;
152 if ( busystate > 50 ) 153 if ( busystate > 5 )
153 busystate = -40; 154 busystate = -4;
154 } 155 }
@@ -313,3 +314,3 @@ private:
313 QPixmap bgPixmap; 314 QPixmap bgPixmap;
314 QPixmap bpm; 315 QPixmap bpm [6];
315 QColor bgColor; 316 QColor bgColor;