← Back to branch summary

~aacid/unity8/disabledMenus

« back to all changes in this revision

Viewing changes to plugins/Utils/WindowInputMonitor.cpp

  • Committer: Albert Astals Cid
  • Date: 2017-03-13 14:13:50 UTC
  • mfrom: (2848.1.1 aboutToShow)
  • Revision ID: albert.astals@canonical.com-20170313141350-a0ao3x3jjmarhk7j
Merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/Utils/WindowInputMonitor.cpp
73
73
                && m_windowLastTouchedTimer->elapsed() >= msecsWithoutTouches) {
74
74
            m_pressedHomeKey = keyEvent->key();
75
75
            m_activationTimer->start();
 
76
        } else if (m_pressedHomeKey != 0 && !m_homeKeys.contains(keyEvent->key())) {
 
77
            // something else came in... cancel activation
 
78
            m_activationTimer->stop();
76
79
        }
77
80
 
78
81
    } else if (event->type() == QEvent::KeyRelease) {