recalculate the cursor's current QRect when changing the cursor graphic

2 files changed, 15 insertions, 4 deletions

diff --git a/src/gui/painting/qgraphicssystemcursor.cpp b/src/gui/painting/qgraphicssystemcursor.cpp
index 300c71946c..cad914dc9c 100644
--- a/src/gui/painting/qgraphicssystemcursor.cpp
+++ b/src/gui/painting/qgraphicssystemcursor.cpp
@@ -94,12 +94,18 @@ QRect QGraphicsSystemCursor::drawCursor(QPainter & painter)
     return prevRect;
 }
 
+QRect QGraphicsSystemCursor::getCurrentRect()
+{
+    QRect rect = graphic->image()->rect().translated(-graphic->hotspot().x(),
+                                                     -graphic->hotspot().y());
+    rect.translate(QCursor::pos());
+    return rect;
+}
+
 void QGraphicsSystemCursor::pointerEvent(const QMouseEvent & e)
 {
-    currentRect = graphic->image()->rect().translated(-graphic->hotspot().x(),
-                                                      -graphic->hotspot().y());
-    currentRect.translate(e.pos());
-    screen->setDirty(QRect(QRect(e.pos(), QSize(1, 1))));
+    currentRect = getCurrentRect();
+    screen->setDirty(currentRect);
 }
 
 void QGraphicsSystemCursor::changeCursor(QCursor * widgetCursor)
@@ -116,6 +122,7 @@ void QGraphicsSystemCursor::changeCursor(QCursor * widgetCursor)
         // system cursor
         setCursor(shape);
     }
+    currentRect = getCurrentRect();
     screen->setDirty(currentRect);
 }
 
@@ -127,6 +134,7 @@ void QGraphicsSystemCursor::changeCursor(QWidget * widget)
      } else {
         // default cursor
         setCursor(Qt::ArrowCursor);
+        currentRect = getCurrentRect();
         screen->setDirty(currentRect);
      }
 }
diff --git a/src/gui/painting/qgraphicssystemcursor.h b/src/gui/painting/qgraphicssystemcursor.h
index de7ce84858..ea303198d5 100644
--- a/src/gui/painting/qgraphicssystemcursor.h
+++ b/src/gui/painting/qgraphicssystemcursor.h
@@ -92,6 +92,9 @@ protected:
     QWidget * currentWidget; // widget currently under the cursor
 
     QGraphicsSystemCursorImage * graphic;
+
+private:
+    QRect getCurrentRect();
 };
 
 QT_END_NAMESPACE