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

[client] Add setScale to Surface

Browse source 
Summary:
The wrapper for wl_surface::set_buffer_scale was still missing.
Main reason for implementation is the need for the added auto-test.

Reviewers: #plasma

Subscribers: plasma-devel

Projects: #plasma

Differential Revision: https://phabricator.kde.org/D1188
This commit is contained in:
Martin Gräßlin 2016-03-21 09:33:05 +01:00
parent 09176d06b6
commit 35e50175fd
1 changed files with 44 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/wayland/autotests/client/test_wayland_surface.cpp
View file

@ -51,6 +51,7 @@ private Q_SLOTS:
void testMultipleSurfaces(); void testMultipleSurfaces();
void testOpaque(); void testOpaque();
void testInput(); void testInput();
void testScale();
void testDestroy(); void testDestroy();
private: private:
@ -631,6 +632,49 @@ void TestWaylandSurface::testInput()
QCOMPARE(serverSurface->inputIsInfinite(), true); QCOMPARE(serverSurface->inputIsInfinite(), true);
} }
void TestWaylandSurface::testScale()
{
// this test verifies that updating the scale factor is correctly passed to the Wayland server
using namespace KWayland::Client;
using namespace KWayland::Server;
// create surface
QSignalSpy serverSurfaceCreated(m_compositorInterface, &CompositorInterface::surfaceCreated);
QVERIFY(serverSurfaceCreated.isValid());
QScopedPointer<Surface> s(m_compositor->createSurface());
QCOMPARE(s->scale(), 1);
QVERIFY(serverSurfaceCreated.wait());
SurfaceInterface *serverSurface = serverSurfaceCreated.first().first().value<KWayland::Server::SurfaceInterface*>();
QVERIFY(serverSurface);
QCOMPARE(serverSurface->scale(), 1);
// let's change the scale factor
QSignalSpy scaleChangedSpy(serverSurface, &SurfaceInterface::scaleChanged);
QVERIFY(scaleChangedSpy.isValid());
s->setScale(2);
QCOMPARE(s->scale(), 2);
// needs a commit
QVERIFY(!scaleChangedSpy.wait(100));
s->commit(Surface::CommitFlag::None);
QVERIFY(scaleChangedSpy.wait());
QCOMPARE(scaleChangedSpy.count(), 1);
QCOMPARE(scaleChangedSpy.first().first().toInt(), 2);
QCOMPARE(serverSurface->scale(), 2);
// let's try changing to same factor, should not emit changed on server
s->setScale(2);
s->commit(Surface::CommitFlag::None);
QVERIFY(!scaleChangedSpy.wait(100));
// but changing to a different value should still work
s->setScale(4);
s->commit(Surface::CommitFlag::None);
QVERIFY(scaleChangedSpy.wait());
QCOMPARE(scaleChangedSpy.count(), 2);
QCOMPARE(scaleChangedSpy.first().first().toInt(), 2);
QCOMPARE(scaleChangedSpy.last().first().toInt(), 4);
QCOMPARE(serverSurface->scale(), 4);
}
void TestWaylandSurface::testDestroy() void TestWaylandSurface::testDestroy()
{ {
using namespace KWayland::Client; using namespace KWayland::Client;