← Back to branch summary

~nskaggs/ubuntu-ui-toolkit/add-popover-object-support

« back to all changes in this revision

Viewing changes to modules/Ubuntu/Components/plugin/inversemouseareatype.cpp

  • Committer: CI bot
  • Author(s): Zsombor Egri, Tarmac, Zoltán Balogh
  • Date: 2014-06-18 17:10:31 UTC
  • mfrom: (1000.76.9 landing_04-06)
  • Revision ID: ps-jenkins@lists.canonical.com-20140618171031-1s026ulaxymh2e9f
  [Leo Arias ]
  * On the autopilot helper for the header, fix the swipe to show
    when hidden.
  * Added a fixture for autopilot tests to use a fake home directory.
    Fixes: https://bugs.launchpad.net/bugs/1317639
  * Cleaned the containers in unity test using the alternate
    launcher.

  [ Christian Dywan ]   
  * Add a launcher with a switch for the QQMLEngine.

  [ Tim Peeters ]
  * Anchor the internal PageTreeNode of PageStack to fill its parent.
    Fixes: https://bugs.launchpad.net/bugs/1322527
 

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/Ubuntu/Components/plugin/inversemouseareatype.cpp
244
244
     */
245
245
    QObject::connect(this, &QQuickMouseArea::windowChanged,
246
246
                     this, &InverseMouseAreaType::resetFilterOnWindowUpdate);
247
 
 
248
 
    if (!m_sensingArea) {
249
 
        // get sensing area upon parent change
250
 
        QObject::connect(this, SIGNAL(parentChanged(QQuickItem*)), this, SLOT(update()));
251
 
    }
252
247
}
253
248
 
254
249
InverseMouseAreaType::~InverseMouseAreaType()
291
286
        m_sensingArea = QuickUtils::instance().rootItem(this);
292
287
    }
293
288
    updateEventFilter(isEnabled() && isVisible() && m_topmostItem);
 
289
    QQuickMouseArea::update();
294
290
}
295
291
/*!
296
292
  \internal
302
298
    updateEventFilter(m_topmostItem);
303
299
}
304
300
 
 
301
void InverseMouseAreaType::itemChange(ItemChange change, const ItemChangeData &data)
 
302
{
 
303
    if (change == ItemParentHasChanged && data.item) {
 
304
        update();
 
305
    }
 
306
    QQuickMouseArea::itemChange(change, data);
 
307
}
 
308
 
305
309
void InverseMouseAreaType::componentComplete()
306
310
{
307
311
    QQuickMouseArea::componentComplete();