Differential D16955 Diff 45661 autotests/integration/shell_client_test.cpp

Changeset View

Standalone View

View Options

autotests/integration/shell_client_test.cpp

Show First 20 Lines • Show All 724 Lines • ▼ Show 20 Line(s)615{
725 case Test::ShellSurfaceType::XdgShellStable: 725​ case Test::ShellSurfaceType::XdgShellStable:
726 qobject_cast<XdgShellSurface*>(shellSurface.data())->setFullscreen(false); 726​ qobject_cast<XdgShellSurface*>(shellSurface.data())->setFullscreen(false);
727 qobject_cast<XdgShellSurface*>(shellSurface.data())->setMaximized(false); 727​ qobject_cast<XdgShellSurface*>(shellSurface.data())->setMaximized(false);
728 break; 728​ break;
729 } 729​ }
730 QVERIFY(fullscreenChangedSpy.wait()); 730​ QVERIFY(fullscreenChangedSpy.wait());
731 if (decoMode == ServerSideDecoration::Mode::Server) { 731​ if (decoMode == ServerSideDecoration::Mode::Server) {
732 QVERIFY(sizeChangeRequestedSpy.wait()); 732​ QVERIFY(sizeChangeRequestedSpy.wait());
733 // don't check count, XDG might legitimately get two updates 733​ // XDG will legitimately get two updates. They might be batched
734​ if (xdgShellSurface && sizeChangeRequestedSpy.count() == 1) {
735​ QVERIFY(sizeChangeRequestedSpy.wait());
736​ }
734 737​
735 // fails as we don't correctly call setMaximize(false) 738​ // fails as we don't correctly call setMaximize(false)
736 // but realistically the only toolkits that support the deco also use XDGShell 739​ // but realistically the only toolkits that support the deco also use XDGShell
737 QEXPECT_FAIL("wlShell - deco", "With decoration incorrect geometry requested", Continue); 740​ QEXPECT_FAIL("wlShell - deco", "With decoration incorrect geometry requested", Continue);
738 741​
739 QCOMPARE(sizeChangeRequestedSpy.last().first().toSize(), QSize(100, 50)); 742​ QCOMPARE(sizeChangeRequestedSpy.last().first().toSize(), QSize(100, 50));
740 } 743​ }
741 // TODO: should switch to fullscreen once it's updated 744​ // TODO: should switch to fullscreen once it's updated
▲ Show 20 Lines • Show All 336 Lines • Show Last 20 Lines