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

Merge branch 'Plasma/5.8'

Browse source
This commit is contained in:
Martin Gräßlin 2016-11-18 16:08:29 +01:00
commit 2619ddf02e
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
abstract_client.cpp
View file

@ -1147,7 +1147,7 @@ QSize AbstractClient::sizeForClientSize(const QSize &wsize, Sizemode mode, bool
{ {
Q_UNUSED(mode) Q_UNUSED(mode)
Q_UNUSED(noframe) Q_UNUSED(noframe)
return wsize; return wsize + QSize(borderLeft() + borderRight(), borderTop() + borderBottom());
} }
void AbstractClient::addRepaintDuringGeometryUpdates() void AbstractClient::addRepaintDuringGeometryUpdates()

1
autotests/integration/shell_client_test.cpp
View file

@ -346,6 +346,7 @@ void TestShellClient::testFullscreen()
QVERIFY(!c->isFullScreen()); QVERIFY(!c->isFullScreen());
QCOMPARE(c->clientSize(), QSize(100, 50)); QCOMPARE(c->clientSize(), QSize(100, 50));
QCOMPARE(c->isDecorated(), decoMode == ServerSideDecoration::Mode::Server); QCOMPARE(c->isDecorated(), decoMode == ServerSideDecoration::Mode::Server);
QCOMPARE(c->sizeForClientSize(c->clientSize()), c->geometry().size());
QSignalSpy fullscreenChangedSpy(c, &ShellClient::fullScreenChanged); QSignalSpy fullscreenChangedSpy(c, &ShellClient::fullScreenChanged);
QVERIFY(fullscreenChangedSpy.isValid()); QVERIFY(fullscreenChangedSpy.isValid());
QSignalSpy geometryChangedSpy(c, &ShellClient::geometryChanged); QSignalSpy geometryChangedSpy(c, &ShellClient::geometryChanged);