← Back to branch summary

~mir-team/qtmir/port-to-msh-shell-and-mirevent2

« back to all changes in this revision

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

  • Committer: Robert Carr
  • Date: 2015-01-30 00:06:46 UTC
  • Revision ID: robert.carr@canonical.com-20150130000646-u3kwzmrj63z7ktl7
Finish touch-event-support

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/modules/Unity/Application/mirsurfaceitem.cpp
117
117
{
118
118
    auto modifiers = mir_modifiers_from_qt(qmods);
119
119
    auto ev = mir::events::make_event(0, static_cast<int64_t>(qtTimestamp) * 1000000,
120
 
                                      modifiers, 0);
 
120
                                      modifiers);
121
121
   
122
122
    for (int i = 0; i < qtTouchPoints.count(); ++i) {
123
123
        auto touchPoint = qtTouchPoints.at(i);
516
516
 
517
517
        touchEvent.updateTouchPointStatesAndType();
518
518
 
519
 
        auto ev = makeMirEvent(touchEvent.touchPoints,
 
519
        auto ev = makeMirEvent(touchEvent.modifiers, touchEvent.touchPoints, 
520
520
                               touchEvent.touchPointStates, touchEvent.timestamp);
521
521
        m_surface->consume(*ev);
522
522