-rw-r--r-- | core/launcher/launcherview.cpp | 57 |
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 | |||
@@ -113,4 +113,9 @@ public: | |||
113 | oldbsy-> repaint ( ); | 113 | oldbsy-> repaint ( ); |
114 | 114 | ||
115 | if ( busytimer ) { | ||
116 | killTimer ( busytimer ); | ||
117 | busytimer = 0; | ||
118 | } | ||
119 | |||
115 | if ( bsy ) { | 120 | if ( bsy ) { |
116 | QPixmap *src = bsy-> QIconViewItem::pixmap(); | 121 | QPixmap *src = bsy-> QIconViewItem::pixmap(); |
@@ -143,18 +148,14 @@ public: | |||
143 | bpm [i].convertFromImage( img ); | 148 | bpm [i].convertFromImage( img ); |
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 | } |
160 | } | 161 | } |
@@ -333,4 +334,45 @@ protected: | |||
333 | } | 334 | } |
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 | |||
335 | private: | 377 | private: |
336 | QList<AppLnk> hidden; | 378 | QList<AppLnk> hidden; |
@@ -932,2 +974,3 @@ void LauncherView::setBusyIndicatorType ( const QString &type ) | |||
932 | icons-> setBusyIndicatorType ( BIT_Normal ); | 974 | icons-> setBusyIndicatorType ( BIT_Normal ); |
933 | } | 975 | } |
976 | |||