diff options
-rw-r--r-- | src/platformsupport/eglconvenience/qeglplatformcursor.cpp | 4 | ||||
-rwxr-xr-x[-rw-r--r--] | src/plugins/platforms/eglfs/cursor-atlas.png | bin | 2735 -> 2928 bytes | |||
-rw-r--r-- | src/plugins/platforms/eglfs/cursor.json | 42 |
3 files changed, 23 insertions, 23 deletions
diff --git a/src/platformsupport/eglconvenience/qeglplatformcursor.cpp b/src/platformsupport/eglconvenience/qeglplatformcursor.cpp index 1c87e1d27d..70e7c4e4db 100644 --- a/src/platformsupport/eglconvenience/qeglplatformcursor.cpp +++ b/src/platformsupport/eglconvenience/qeglplatformcursor.cpp @@ -210,7 +210,7 @@ void QEGLPlatformCursor::initCursorAtlas() m_cursorAtlas.cursorsPerRow = cursorsPerRow; const QJsonArray hotSpots = object.value(QLatin1String("hotSpots")).toArray(); - Q_ASSERT(hotSpots.count() == Qt::LastCursor); + Q_ASSERT(hotSpots.count() == Qt::LastCursor + 1); for (int i = 0; i < hotSpots.count(); i++) { QPoint hotSpot(hotSpots[i].toArray()[0].toDouble(), hotSpots[i].toArray()[1].toDouble()); m_cursorAtlas.hotSpots << hotSpot; @@ -218,7 +218,7 @@ void QEGLPlatformCursor::initCursorAtlas() QImage image = QImage(atlas).convertToFormat(QImage::Format_ARGB32_Premultiplied); m_cursorAtlas.cursorWidth = image.width() / m_cursorAtlas.cursorsPerRow; - m_cursorAtlas.cursorHeight = image.height() / ((Qt::LastCursor + cursorsPerRow - 1) / cursorsPerRow); + m_cursorAtlas.cursorHeight = image.height() / ((Qt::LastCursor + cursorsPerRow) / cursorsPerRow); m_cursorAtlas.width = image.width(); m_cursorAtlas.height = image.height(); m_cursorAtlas.image = image; diff --git a/src/plugins/platforms/eglfs/cursor-atlas.png b/src/plugins/platforms/eglfs/cursor-atlas.png Binary files differindex 8d89a7ab86..4ddb7708e1 100644..100755 --- a/src/plugins/platforms/eglfs/cursor-atlas.png +++ b/src/plugins/platforms/eglfs/cursor-atlas.png diff --git a/src/plugins/platforms/eglfs/cursor.json b/src/plugins/platforms/eglfs/cursor.json index 7b6b6d95fa..307d5cf6cd 100644 --- a/src/plugins/platforms/eglfs/cursor.json +++ b/src/plugins/platforms/eglfs/cursor.json @@ -3,26 +3,26 @@ "cursorsPerRow": 8, "hotSpots": [ [7, 2], - [13, 3], - [13, 13], - [13, 13], - [14, 15], - [13, 13], - [13, 13], - [13, 13], - [13, 13], - [13, 13], - [13, 13], - [13, 13], - [13, 13], - [13, 13], - [13, 13], - [10, 1], - [13, 13], - [0, 0], - [0, 0], - [13, 13], - [13, 13] + [12, 3], + [12, 12], + [12, 12], + [12, 12], + [12, 12], + [12, 12], + [12, 12], + [12, 12], + [11, 11], + [12, 12], + [12, 12], + [12, 12], + [9, 1], + [12, 12], + [1, 1], + [1, 1], + [12, 12], + [12, 12], + [12, 12], + [12, 12], + [12, 12] ] } - |