Windows: Introduce pixmap cursor cache.

Cache custom cursors.

Task-number: QTBUG-28879

Change-Id: I8f2b5b9149966399a6173dbd19f6a8e85898924b
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

2 files changed, 17 insertions, 1 deletions

diff --git a/src/plugins/platforms/windows/qwindowscursor.cpp b/src/plugins/platforms/windows/qwindowscursor.cpp
index 84c82dca45..31b49a516f 100644
--- a/src/plugins/platforms/windows/qwindowscursor.cpp
+++ b/src/plugins/platforms/windows/qwindowscursor.cpp
@@ -394,6 +394,19 @@ QWindowsWindowCursor QWindowsCursor::standardWindowCursor(Qt::CursorShape shape)
 }
 
 /*!
+    \brief Return cached pixmap cursor or create new one.
+*/
+
+QWindowsWindowCursor QWindowsCursor::pixmapWindowCursor(const QCursor &c)
+{
+    const qint64 cacheKey = c.pixmap().cacheKey();
+    PixmapCursorCache::iterator it = m_pixmapCursorCache.find(cacheKey);
+    if (it == m_pixmapCursorCache.end())
+        it = m_pixmapCursorCache.insert(cacheKey, QWindowsWindowCursor(c));
+    return it.value();
+}
+
+/*!
     \brief Set a cursor on a window.
 
     This is called frequently as the mouse moves over widgets in the window
@@ -413,7 +426,7 @@ void QWindowsCursor::changeCursor(QCursor *cursorIn, QWindow *window)
     }
     const QWindowsWindowCursor wcursor =
         cursorIn->shape() == Qt::BitmapCursor ?
-        QWindowsWindowCursor(*cursorIn) : standardWindowCursor(cursorIn->shape());
+        pixmapWindowCursor(*cursorIn) : standardWindowCursor(cursorIn->shape());
     if (wcursor.handle()) {
         QWindowsWindow::baseWindowOf(window)->setCursor(wcursor);
     } else {
diff --git a/src/plugins/platforms/windows/qwindowscursor.h b/src/plugins/platforms/windows/qwindowscursor.h
index b4026f00bc..4ee6695188 100644
--- a/src/plugins/platforms/windows/qwindowscursor.h
+++ b/src/plugins/platforms/windows/qwindowscursor.h
@@ -83,11 +83,14 @@ public:
     static QPoint mousePosition();
 
     QWindowsWindowCursor standardWindowCursor(Qt::CursorShape s = Qt::ArrowCursor);
+    QWindowsWindowCursor pixmapWindowCursor(const QCursor &c);
 
 private:
     typedef QHash<Qt::CursorShape, QWindowsWindowCursor> StandardCursorCache;
+    typedef QHash<qint64, QWindowsWindowCursor> PixmapCursorCache;
 
     StandardCursorCache m_standardCursorCache;
+    PixmapCursorCache m_pixmapCursorCache;
 };
 
 QT_END_NAMESPACE