← Back to branch summary

~ubuntu-branches/ubuntu/quantal/kde-workspace/quantal

« back to all changes in this revision

Viewing changes to kwin/effects/startupfeedback/startupfeedback.cpp

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2012-07-26 17:32:34 UTC
  • mfrom: (1.1.15)
  • Revision ID: package-import@ubuntu.com-20120726173234-bsn4gwllpbcwu2r4
Tags: 4:4.9.0-0ubuntu1
* Use direct build-depends versions rather than kde-sc-dev-latest
* Remove patches/kubuntu_revert_1554ba408633397066d31c3d565c217b5a385fb8.diff fixed upstream
* Remove debian/patches/kubuntu_fix_batterymonitor_panel_minsize.diff fix upstream
* New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
kwin/effects/startupfeedback/startupfeedback.cpp
163
163
        default:
164
164
            break; // nothing
165
165
        }
166
 
        m_currentGeometry = feedbackRect();
167
 
        data.paint.unite(m_currentGeometry);
 
166
        data.paint.unite(m_dirtyRect);
 
167
        m_dirtyRect = QRect();
168
168
    }
169
169
    effects->prePaintScreen(data, time);
170
170
}
243
243
        case BouncingFeedback: // fall through
244
244
        case BlinkingFeedback:
245
245
            // repaint the icon
246
 
            effects->addRepaint(m_currentGeometry);
 
246
            m_dirtyRect = m_currentGeometry;
 
247
            effects->addRepaint(m_dirtyRect);
247
248
            break;
248
249
        case PassiveFeedback: // fall through
249
250
        default:
264
265
    Q_UNUSED(modifiers)
265
266
    Q_UNUSED(oldmodifiers)
266
267
    if (m_active) {
267
 
        effects->addRepaint(m_currentGeometry);
268
 
        effects->addRepaint(feedbackRect());
 
268
        m_dirtyRect |= m_currentGeometry;
 
269
        m_currentGeometry = feedbackRect();
 
270
        m_dirtyRect |= m_currentGeometry;
 
271
        effects->addRepaint(m_dirtyRect);
269
272
    }
270
273
}
271
274
 
308
311
    if (!m_active)
309
312
        effects->startMousePolling();
310
313
    m_active = true;
 
314
    m_dirtyRect = m_currentGeometry = feedbackRect();
311
315
    QPixmap iconPixmap = KIconLoader::global()->loadIcon(icon, KIconLoader::Small, 0,
312
316
                         KIconLoader::DefaultState, QStringList(), 0, true);  // return null pixmap if not found
313
317
    if (iconPixmap.isNull())