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

Provide hotspot in the device independent pixels

Browse source 
Currently, the trend is to get the coordinates of the hotspot and map it
to the device independent pixels at the call site.

This change makes the KXcursorSprite return the coordinates of the hotspot
in the device independent pixels to reduce the amount of duplicated code.
This commit is contained in:
Vlad Zahorodnii 2020-07-13 19:05:34 +03:00 committed by Vlad Zahorodnii
parent 487e2d9fb6
commit 1330abc93d
4 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
autotests/integration/pointer_input.cpp
View file

@ -64,7 +64,6 @@ static PlatformCursorImage loadReferenceThemeCursor_helper(const KXcursorTheme &
cursorImage.setDevicePixelRatio(theme.devicePixelRatio());
QPoint cursorHotspot = sprites.first().hotspot();
cursorHotspot /= theme.devicePixelRatio();
return PlatformCursorImage(cursorImage, cursorHotspot);
}

1
pointer_input.cpp
View file

@ -1322,7 +1322,6 @@ bool WaylandCursorImage::loadThemeCursor_helper(const QByteArray &name, Image *c
cursorImage->image.setDevicePixelRatio(m_cursorTheme.devicePixelRatio());
cursorImage->hotspot = sprites.first().hotspot();
cursorImage->hotspot /= m_cursorTheme.devicePixelRatio();
return true;
}

2
xcursortheme.cpp
View file

@ -96,7 +96,7 @@ static void load_callback(XcursorImages *images, void *data)
QImage data(nativeCursorImage->width, nativeCursorImage->height, QImage::Format_ARGB32);
memcpy(data.bits(), nativeCursorImage->pixels, data.sizeInBytes());
sprites.append(KXcursorSprite(data, hotspot, delay));
sprites.append(KXcursorSprite(data, hotspot / themePrivate->devicePixelRatio, delay));
}
themePrivate->registry.insert(images->name, sprites);

2
xcursortheme.h
View file

@ -71,7 +71,7 @@ public:
/**
* Returns the hotspot for this sprite. (0, 0) corresponds to the upper left corner.
*
* The coordinates of the hotspot are in device pixels.
* The coordinates of the hotspot are in device independent pixels.
*/
QPoint hotspot() const;