← Back to branch summary

~dandrader/qtmir/surfaceItemFillMode

« back to all changes in this revision

Viewing changes to src/modules/Unity/Application/mirsurfaceitem.cpp

  • Committer: CI Train Bot
  • Author(s): Lukáš Tinkl
  • Date: 2015-10-21 11:47:03 UTC
  • mfrom: (381.1.8 wheelEvent)
  • Revision ID: ci-train-bot@canonical.com-20151021114703-7w40trt2rwubflri
Implement support for mouse wheel events; correctly pass around buttons Fixes: #1497091
Approved by: Gerry Boland

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/modules/Unity/Application/mirsurfaceitem.cpp
298
298
 
299
299
void MirSurfaceItem::wheelEvent(QWheelEvent *event)
300
300
{
301
 
    Q_UNUSED(event);
 
301
    if (m_consumesInput && m_surface && m_surface->live()) {
 
302
        m_surface->wheelEvent(event);
 
303
    } else {
 
304
        event->ignore();
 
305
    }
302
306
}
303
307
 
304
308
void MirSurfaceItem::hoverEnterEvent(QHoverEvent *event)