yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'Plasma/5.4'

Browse source
This commit is contained in:
Martin Gräßlin 2015-09-30 10:30:47 +02:00
commit 1f2087ce7c
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
autotests/test_screen_edges.cpp
View file

@ -477,7 +477,7 @@ void TestScreenEdges::testCallback()
QCOMPARE(Cursor::pos(), QPoint(1, 101)); QCOMPARE(Cursor::pos(), QPoint(1, 101));
// now let's try to trigger again // now let's try to trigger again
QTest::qWait(100); QTest::qWait(351);
setPos(QPoint(0, 100)); setPos(QPoint(0, 100));
event.time = QDateTime::currentMSecsSinceEpoch(); event.time = QDateTime::currentMSecsSinceEpoch();
QVERIFY(s->isEntered(&event)); QVERIFY(s->isEntered(&event));
@ -507,6 +507,7 @@ void TestScreenEdges::testCallback()
s->setConfig(config); s->setConfig(config);
s->reconfigure(); s->reconfigure();
// it should trigger directly // it should trigger directly
QTest::qWait(350);
event.time = QDateTime::currentMSecsSinceEpoch(); event.time = QDateTime::currentMSecsSinceEpoch();
QVERIFY(s->isEntered(&event)); QVERIFY(s->isEntered(&event));
QCOMPARE(spy.count(), 3); QCOMPARE(spy.count(), 3);
@ -688,6 +689,7 @@ void TestScreenEdges::testFullScreenBlocking()
QCOMPARE(Cursor::pos(), QPoint(1, 50)); QCOMPARE(Cursor::pos(), QPoint(1, 50));
// let's make the client fullscreen again, but with a geometry not intersecting the left edge // let's make the client fullscreen again, but with a geometry not intersecting the left edge
QTest::qWait(351);
client.setFullScreen(true); client.setFullScreen(true);
client.setGeometry(client.geometry().translated(10, 0)); client.setGeometry(client.geometry().translated(10, 0));
emit s->checkBlocking(); emit s->checkBlocking();