← Back to branch summary

~ubuntu-branches/ubuntu/maverick/kdebase-workspace/maverick-proposed

« back to all changes in this revision

Viewing changes to plasma/generic/applets/systemtray/ui/applet.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Alessandro Ghersi
  • Date: 2010-07-08 01:11:52 UTC
  • mfrom: (1.1.43 upstream)
  • Revision ID: james.westby@ubuntu.com-20100708011152-z0h26httnjr91mmy
Tags: 4:4.4.92-0ubuntu1
* New upstream rc release:
  - Bump kde-sc-dev-latest to 4.4.92
  - Refresh patches
  - Update symbols
  - plasma-widgets-workspace replaces/conflicts plasma-widget-logout

Show diffs side-by-side

added added

removed removed

Lines of Context:
plasma/generic/applets/systemtray/ui/applet.cpp
343
343
    m_background->setElementPrefix(QString());
344
344
    m_background->resizeFrame(r.size());
345
345
    if (leftEasement > 0 || m_taskArea->rightEasement() > 0) {
346
 
        painter->setClipRect(normalRect);
 
346
        painter->setClipRect(normalRect, Qt::IntersectClip);
347
347
    }
348
348
 
349
349
    m_background->paintFrame(painter, r, QRectF(QPointF(0, 0), r.size()));
356
356
        }
357
357
        m_background->resizeFrame(r.size());
358
358
        QRect firstRect = QRegion(r).subtracted(normalRect).boundingRect();
359
 
        painter->setClipRect(firstRect);
 
359
        painter->setClipRect(firstRect, Qt::IntersectClip);
360
360
 
361
361
        m_background->paintFrame(painter, r, QRectF(QPointF(0, 0), r.size()));
362
362
 
 
363
        painter->setClipRect(boundingRect(), Qt::IntersectClip);
 
364
 
363
365
        if (formFactor() == Plasma::Vertical && m_background->hasElement("horizontal-separator")) {
364
366
            QSize s = m_background->elementRect("horizontal-separator").size().toSize();
365
367
            m_background->paint(painter, QRect(normalRect.topLeft() - QPoint(0, s.height() / 2),
421
423
        parent->addPage(m_autoHideInterface.data(), i18n("Entries"), "configure-toolbars");
422
424
 
423
425
        bool visible = (immutability() == Plasma::UserImmutable);
 
426
        //FIXME: always showing the scrollbar is due to a bug somewhere in QAbstractScrollArea,
 
427
        //QListView and/or KCategorizedView; without it, under certain circumstances it will
 
428
        //go into an infinite loop. too many people are running into this problem, so we are
 
429
        //working around the problem rather than waiting for an upstream fix, which is against
 
430
        //our usual policy.
 
431
        //to determine if this line is no longer needed in the future, comment it out, lock
 
432
        //widgets, then call up the configuration dialog for a system tray applet and click
 
433
        //on the "unlock widgets" button.
 
434
        m_visibleItemsUi.visibleItemsView->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
424
435
        m_visibleItemsUi.visibleItemsView->setEnabled(immutability() == Plasma::Mutable);
425
436
        m_visibleItemsUi.unlockLabel->setVisible(visible);
426
437
        m_visibleItemsUi.unlockButton->setVisible(visible);