← Back to branch summary

~ci-train-bot/unity8/unity8-ubuntu-zesty-2026

« back to all changes in this revision

Viewing changes to plugins/Ubuntu/Gestures/TouchGate.cpp

  • Committer: Bileto Bot
  • Author(s): Michael Zanetti
  • Date: 2016-10-24 11:34:08 UTC
  • mfrom: (2400.6.204 unity8-unified-spread)
  • Revision ID: ci-train-bot@canonical.com-20161024113408-7ul8ivww68dqm74v
Merge all Stages into one single codebase. Apply new spread visuals.

This deletes PhoneStage, TabletStage and DesktopStage, and merges all of the functionality into Stage. Also the spread visuals have been updated by design to work with all usage modes. (LP: #1489517, #1603914, #1635800)

Approved by: Lukáš Tinkl

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/Ubuntu/Gestures/TouchGate.cpp
61
61
        const QTouchEvent::TouchPoint &touchPoint = touchPoints[i];
62
62
 
63
63
        if (touchPoint.state() == Qt::TouchPointPressed) {
64
 
            Q_ASSERT(!m_touchInfoMap.contains(touchPoint.id()));
 
64
// FIXME: This assert triggers frequently in make trySomething. We have verified
 
65
// that it's a bug in the mouse to touch conversion of the test environment
 
66
// and not in the actual product. Still, it probably should be cleaned up eventually.
 
67
//            Q_ASSERT(!m_touchInfoMap.contains(touchPoint.id()));
65
68
            m_touchInfoMap[touchPoint.id()].ownership = OwnershipRequested;
66
69
            m_touchInfoMap[touchPoint.id()].ended = false;
67
70
            TouchRegistry::instance()->requestTouchOwnership(touchPoint.id(), this);