Changeset 77726 in vbox

Timestamp:

Mar 15, 2019 2:13:17 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

129374

Message:

FE/Qt: bugref:9376: Treat cursor hotspot position more carefully.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIFrameBuffer.cpp (modified) (1 diff)
• UISession.cpp (modified) (7 diffs)
• UISession.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp

@@ -1312 +1312 @@
     {
         /* Acquire cursor position and size: */
-        QPoint cursorPosition = QPoint(uX, uY);
+        QPoint cursorPosition = QPoint(uX, uY) - m_pMachineView->uisession()->cursorHotspot();
         QSize cursorSize = m_pMachineView->uisession()->cursorSize();
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -1644 +1644 @@
             memcpy(image.scanLine(y), pu32SrcShapeScanline, uWidth * sizeof(uint32_t));
 
-        m_cursor = QCursor(QPixmap::fromImage(image), uXHot, uYHot);
+        m_cursorPixmap = QPixmap::fromImage(image);
+        m_cursor = QCursor(m_cursorPixmap, uXHot, uYHot);
     }
     else
@@ -1733 +1734 @@
             }
 
-            m_cursor = QCursor(QBitmap::fromImage(bitmap), QBitmap::fromImage(mask), uXHot, uYHot);
+            m_cursorPixmap = QBitmap::fromImage(bitmap);
+            m_cursor = QCursor(m_cursorPixmap, QBitmap::fromImage(mask), uXHot, uYHot);
         }
         else
@@ -1763 +1765 @@
             }
 
-            m_cursor = QCursor(QPixmap::fromImage(image), uXHot, uYHot);
+            m_cursorPixmap = QPixmap::fromImage(image);
+            m_cursor = QCursor(m_cursorPixmap, uXHot, uYHot);
         }
     }
@@ -1787 +1790 @@
 
     /* Create cursor-pixmap from the image: */
-    QPixmap cursorPixmap = QPixmap::fromImage(image);
+    m_cursorPixmap = QPixmap::fromImage(image);
 
 # if defined(VBOX_WS_MAC)
@@ -1801 +1804 @@
         uXHot /= dDevicePixelRatio;
         uYHot /= dDevicePixelRatio;
-        cursorPixmap.setDevicePixelRatio(dDevicePixelRatio);
+        m_cursorPixmap.setDevicePixelRatio(dDevicePixelRatio);
     }
 # elif defined(VBOX_WS_X11)
@@ -1815 +1818 @@
         uXHot *= dDevicePixelRatio;
         uYHot *= dDevicePixelRatio;
-        cursorPixmap = cursorPixmap.scaled(cursorPixmap.width() * dDevicePixelRatio, cursorPixmap.height() * dDevicePixelRatio,
-                                           Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+        m_cursorPixmap = m_cursorPixmap.scaled(m_cursorPixmap.width() * dDevicePixelRatio, m_cursorPixmap.height() * dDevicePixelRatio,
+                                               Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
     }
 # endif /* VBOX_WS_X11 */
 
     /* Set the new cursor: */
-    m_cursor = QCursor(cursorPixmap, uXHot, uYHot);
+    m_cursor = QCursor(m_cursorPixmap, uXHot, uYHot);
     m_fIsValidPointerShapePresent = true;
     NOREF(srcShapePtrScan);
@@ -1832 +1835 @@
 
     /* Cache cursor pixmap data: */
-    m_cursorPixmap = m_cursor.pixmap();
+    m_cursorHotspot = QPoint(uXHot, uYHot);
     m_cursorSize = m_cursorPixmap.size();
 }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.h

@@ -138 +138 @@
     /** Returns currently cached mouse cursor pixmap. */
     QPixmap cursorPixmap() const { return m_cursorPixmap; }
+    /** Returns currently cached mouse cursor hotspot. */
+    QPoint cursorHotspot() const { return m_cursorHotspot; }
     /** Returns currently cached mouse cursor size. */
     QSize cursorSize() const { return m_cursorSize; }
@@ -488 +490 @@
     /** Holds cached mouse cursor pixmap. */
     QPixmap  m_cursorPixmap;
+    /** Holds cached mouse cursor hotspot. */
+    QPoint   m_cursorHotspot;
     /** Holds cached mouse cursor size. */
     QSize    m_cursorSize;