From b1908949d09cfae46ab5f0c2c26976ec98351327 Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Fri, 2 Feb 2024 18:45:05 +0200 Subject: [PATCH] autotests: Use ShapeCursorSource to load reference cursor images in testPointerInput --- autotests/integration/pointer_input.cpp | 28 ++++--------------------- 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/autotests/integration/pointer_input.cpp b/autotests/integration/pointer_input.cpp index 7bf4c2dbec..0c83549c52 100644 --- a/autotests/integration/pointer_input.cpp +++ b/autotests/integration/pointer_input.cpp @@ -38,17 +38,6 @@ namespace KWin { -static PlatformCursorImage loadReferenceThemeCursor_helper(const KXcursorTheme &theme, - const QByteArray &name) -{ - const QList sprites = theme.shape(name); - if (sprites.isEmpty()) { - return PlatformCursorImage(); - } - - return PlatformCursorImage(sprites.constFirst().data(), sprites.constFirst().hotspot()); -} - static PlatformCursorImage loadReferenceThemeCursor(const QByteArray &name) { const Cursor *pointerCursor = Cursors::self()->mouse(); @@ -58,20 +47,11 @@ static PlatformCursorImage loadReferenceThemeCursor(const QByteArray &name) return PlatformCursorImage(); } - PlatformCursorImage platformCursorImage = loadReferenceThemeCursor_helper(theme, name); - if (!platformCursorImage.isNull()) { - return platformCursorImage; - } + ShapeCursorSource source; + source.setShape(name); + source.setTheme(theme); - const QList alternativeNames = Cursor::cursorAlternativeNames(name); - for (const QByteArray &alternativeName : alternativeNames) { - platformCursorImage = loadReferenceThemeCursor_helper(theme, alternativeName); - if (!platformCursorImage.isNull()) { - break; - } - } - - return platformCursorImage; + return PlatformCursorImage(source.image(), source.hotspot()); } static PlatformCursorImage loadReferenceThemeCursor(const CursorShape &shape)