Changeset 77763 in vbox

Timestamp:

Mar 18, 2019 2:46:17 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9376: macOS fix for r129374.

Location:

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

Files:

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

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

@@ -1311 +1311 @@
     if (m_pMachineView && m_fCursorPositionValid)
     {
+        /* Acquire cursor hotspot: */
+        QPoint cursorHotspot = m_pMachineView->uisession()->cursorHotspot();
+
+#ifdef VBOX_WS_MAC
+        /* Apply the scale-factor if necessary: */
+        cursorHotspot /= scaleFactor();
+
+        /* Take the device-pixel-ratio into account: */
+        if (!useUnscaledHiDPIOutput())
+            cursorHotspot /= devicePixelRatioActual();
+#endif
+
         /* Acquire cursor position and size: */
-        QPoint cursorPosition = QPoint(uX, uY) - m_pMachineView->uisession()->cursorHotspot();
+        QPoint cursorPosition = QPoint(uX, uY) - cursorHotspot;
         QSize cursorSize = m_pMachineView->uisession()->cursorSize();
 

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

@@ -1623 +1623 @@
     uint srcShapePtrScan = uWidth * 4;
 
+    /* Remember initial cursor hotspot: */
+    m_cursorHotspot = QPoint(uXHot, uYHot);
+
 #if defined (VBOX_WS_WIN)
 
@@ -1834 +1837 @@
 #endif
 
-    /* Cache cursor pixmap data: */
-    m_cursorHotspot = QPoint(uXHot, uYHot);
+    /* Cache cursor pixmap size: */
     m_cursorSize = m_cursorPixmap.size();
 }