summaryrefslogtreecommitdiff
authorsandman <sandman>2002-10-23 23:51:11 (UTC)
committer sandman <sandman>2002-10-23 23:51:11 (UTC)
commit36e13db0a1d44abd5a160a34e4679b90d62826c7 (patch) (unidiff)
tree6996137d6ffd992e7eef8be1802d667b3184f62a
parent8d8ebc66cefd889c0cbc13d7d3d4158bdcb55962 (diff)
downloadopie-36e13db0a1d44abd5a160a34e4679b90d62826c7.zip
opie-36e13db0a1d44abd5a160a34e4679b90d62826c7.tar.gz
opie-36e13db0a1d44abd5a160a34e4679b90d62826c7.tar.bz2
- fix for the busy indicator timer, in case someone switches to non-blink
style, while the indicator is blinking - the launcher QIconView is now drawn flickerfree into a background QPixmap
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/launcherview.cpp57
1 files changed, 50 insertions, 7 deletions
diff --git a/core/launcher/launcherview.cpp b/core/launcher/launcherview.cpp
index 6e63fca..9fc4565 100644
--- a/core/launcher/launcherview.cpp
+++ b/core/launcher/launcherview.cpp
@@ -114,2 +114,7 @@ public:
114 114
115 if ( busytimer ) {
116 killTimer ( busytimer );
117 busytimer = 0;
118 }
119
115 if ( bsy ) { 120 if ( bsy ) {
@@ -144,16 +149,12 @@ public:
144 } 149 }
150
145 if ( busyType == BIT_Blinking ) { 151 if ( busyType == BIT_Blinking ) {
146 busystate = 0; 152 busystate = 0;
147 if ( busytimer )
148 killTimer ( busytimer );
149 busytimer = startTimer ( 200 ); 153 busytimer = startTimer ( 200 );
150 } 154 }
151 else 155 else {
152 busystate = 3; 156 busystate = 3;
157 }
153 timerEvent ( 0 ); 158 timerEvent ( 0 );
154 } 159 }
155 else {
156 killTimer ( busytimer );
157 busytimer = 0;
158 }
159 } 160 }
@@ -334,2 +335,43 @@ protected:
334 335
336
337 // flicker free redrawing of busy indicator
338 // code was taken from QScrollView::viewportPaintEvent
339 void viewportPaintEvent( QPaintEvent* pe )
340 {
341 static QPixmap *pix = new QPixmap ( );
342
343 QWidget* vp = viewport();
344
345 if ( vp-> size ( ) != pix-> size ( ))
346 pix-> resize ( vp-> size ( ));
347
348 QPainter p(pix, vp);
349 QRect r = pe->rect();
350 if ( clipper ( ) != vp ) {
351 QRect rr(
352 -vp->x(), -vp->y(),
353 clipper()->width(), clipper()->height()
354 );
355 r &= rr;
356 if ( r.isValid() ) {
357 int ex = r.x() + vp->x() + contentsX();
358 int ey = r.y() + vp->y() + contentsY();
359 int ew = r.width();
360 int eh = r.height();
361 drawContentsOffset(&p,
362 contentsX()+vp->x(),
363 contentsY()+vp->y(),
364 ex, ey, ew, eh);
365 }
366 } else {
367 r &= clipper()->rect();
368 int ex = r.x() + contentsX();
369 int ey = r.y() + contentsY();
370 int ew = r.width();
371 int eh = r.height();
372 drawContentsOffset(&p, contentsX(), contentsY(), ex, ey, ew, eh);
373 }
374 bitBlt ( vp, r.topLeft(), pix, r );
375 }
376
335private: 377private:
@@ -933 +975,2 @@ void LauncherView::setBusyIndicatorType ( const QString &type )
933} 975}
976