git.iko.soy/unity8
on xenial help sign in
add a test
4b2a463Michael Zanetti
plugins/Utils/WindowInputMonitor.cpp+3−3
compare with xenial
unifiedsplit
@@ -73,9 +73,9 @@ void WindowInputMonitor::update(QEvent *event)
73 && m_windowLastTouchedTimer->elapsed() >= msecsWithoutTouches) {
73 && m_windowLastTouchedTimer->elapsed() >= msecsWithoutTouches) {
74 m_pressedHomeKey = keyEvent->key();
74 m_pressedHomeKey = keyEvent->key();
75 m_activationTimer->start();
75 m_activationTimer->start();
76− } else if (m_pressedHomeKey != 0) {
76+// } else if (m_pressedHomeKey != 0 && !m_homeKeys.contains(keyEvent->key())) {
77− // something else came in... cancel activation
77+// // something else came in... cancel activation
78− m_activationTimer->stop();
78+// m_activationTimer->stop();
79 }
79 }
80
80
81 } else if (event->type() == QEvent::KeyRelease) {
81 } else if (event->type() == QEvent::KeyRelease) {
tests/plugins/Utils/WindowInputMonitorTest.cpp+34
@@ -89,6 +89,8 @@ private Q_SLOTS:
89 void tapWhileTouching();
89 void tapWhileTouching();
90 void multipleHomeKeys();
90 void multipleHomeKeys();
91
91
92+ void keyComboInvolvingHome();
93+
92 void repeatedSuperPress();
94 void repeatedSuperPress();
93
95
94private:
96private:
@@ -197,6 +199,38 @@ void WindowInputMonitorTest::touchTapTouch()
197 QCOMPARE(activatedSpy.count(), expectedActivatedCount);
199 QCOMPARE(activatedSpy.count(), expectedActivatedCount);
198}
200}
199
201
202+void WindowInputMonitorTest::keyComboInvolvingHome()
203+{
204+ WindowInputMonitor homeKeyWatcher(m_fakeTimerFactory->create(this), new FakeElapsedTimer);
205+ QSignalSpy activatedSpy(&homeKeyWatcher, &WindowInputMonitor::homeKeyActivated);
206+ QVERIFY(activatedSpy.isValid());
207+
208+ passTime(1000);
209+ {
210+ QKeyEvent keyEvent(QEvent::KeyPress, Qt::Key_Super_L, Qt::NoModifier);
211+ homeKeyWatcher.update(&keyEvent);
212+ }
213+ passTime(100);
214+
215+ {
216+ QKeyEvent keyEvent(QEvent::KeyPress, Qt::Key_A, Qt::NoModifier);
217+ homeKeyWatcher.update(&keyEvent);
218+ }
219+ passTime(100);
220+ {
221+ QKeyEvent keyEvent(QEvent::KeyRelease, Qt::Key_A, Qt::NoModifier);
222+ homeKeyWatcher.update(&keyEvent);
223+ }
224+ passTime(100);
225+ {
226+ QKeyEvent keyEvent(QEvent::KeyRelease, Qt::Key_Super_L, Qt::NoModifier);
227+ homeKeyWatcher.update(&keyEvent);
228+ }
229+ passTime(1000);
230+
231+ QCOMPARE(activatedSpy.count(), 0);
232+}
233+
200void WindowInputMonitorTest::tapWhileTouching()
234void WindowInputMonitorTest::tapWhileTouching()
201{
235{
202 WindowInputMonitor homeKeyWatcher(m_fakeTimerFactory->create(this), new FakeElapsedTimer);
236 WindowInputMonitor homeKeyWatcher(m_fakeTimerFactory->create(this), new FakeElapsedTimer);