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

Merge branch 'Plasma/5.9'

Browse source
This commit is contained in:
Martin Gräßlin 2017-01-30 17:03:46 +01:00
commit c35aae2c4f
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
autotests/integration/move_resize_window_test.cpp
View file

@ -252,7 +252,6 @@ void MoveResizeWindowTest::testResize()
Test::render(surface.data(), QSize(108, 50), Qt::blue); Test::render(surface.data(), QSize(108, 50), Qt::blue);
QVERIFY(geometryChangedSpy.wait()); QVERIFY(geometryChangedSpy.wait());
QCOMPARE(c->geometry(), QRect(0, 0, 108, 50)); QCOMPARE(c->geometry(), QRect(0, 0, 108, 50));
QEXPECT_FAIL("", "BUG 374869", Continue);
QCOMPARE(clientStepUserMovedResizedSpy.count(), 1); QCOMPARE(clientStepUserMovedResizedSpy.count(), 1);
// go down // go down
@ -266,7 +265,6 @@ void MoveResizeWindowTest::testResize()
Test::render(surface.data(), QSize(108, 58), Qt::blue); Test::render(surface.data(), QSize(108, 58), Qt::blue);
QVERIFY(geometryChangedSpy.wait()); QVERIFY(geometryChangedSpy.wait());
QCOMPARE(c->geometry(), QRect(0, 0, 108, 58)); QCOMPARE(c->geometry(), QRect(0, 0, 108, 58));
QEXPECT_FAIL("", "BUG 374869", Continue);
QCOMPARE(clientStepUserMovedResizedSpy.count(), 2); QCOMPARE(clientStepUserMovedResizedSpy.count(), 2);
// let's end // let's end

4
shell_client.cpp
View file

@ -508,6 +508,10 @@ void ShellClient::doSetGeometry(const QRect &rect)
workspace()->updateClientArea(); workspace()->updateClientArea();
} }
emit geometryShapeChanged(this, old); emit geometryShapeChanged(this, old);
if (isResize()) {
performMoveResize();
}
} }
void ShellClient::doMove(int x, int y) void ShellClient::doMove(int x, int y)