diff options
author | Liang Qi <liang.qi@qt.io> | 2022-03-10 12:44:59 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2022-03-22 10:18:49 +0100 |
commit | eaaa8b6242cc2926193932dd47843dee2c19ec65 (patch) | |
tree | 881b08b10086bcb144f4f956c3acfec432bf4d08 /tests | |
parent | 51ad57f31f33b3c57f0a72746b6cad9dd5d87565 (diff) | |
download | qtwayland-eaaa8b6242cc2926193932dd47843dee2c19ec65.tar.gz |
tests: fix DefaultCompositor::surface() when index > 0
This amends 0154d0b65b139c4919a020c29846f56697b5b42c.
Pick-to: 6.3
Change-Id: Id0759ebab699d762c134246d0ec9f72b03923bac
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/client/shared/mockcompositor.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/tests/auto/client/shared/mockcompositor.cpp b/tests/auto/client/shared/mockcompositor.cpp index d3742e09..c62ddfab 100644 --- a/tests/auto/client/shared/mockcompositor.cpp +++ b/tests/auto/client/shared/mockcompositor.cpp @@ -81,23 +81,25 @@ DefaultCompositor::DefaultCompositor(CompositorType t) Surface *DefaultCompositor::surface(int i) { - Surface *result = nullptr; + QList<Surface *> surfaces; switch (m_type) { case CompositorType::Default: - result = get<WlCompositor>()->m_surfaces.value(i, nullptr); - break; + return get<WlCompositor>()->m_surfaces.value(i, nullptr); case CompositorType::Legacy: { - QList<Surface *> surfaces = get<WlCompositor>()->m_surfaces; - for (Surface *surface : surfaces) { + QList<Surface *> msurfaces = get<WlCompositor>()->m_surfaces; + for (Surface *surface : msurfaces) { if (surface->isMapped()) { - result = surface; - break; + surfaces << surface; } } } break; } - return result; + + if (i >= 0 && i < surfaces.size()) + return surfaces[i]; + + return nullptr; } uint DefaultCompositor::sendXdgShellPing() |