Changeset 81622 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Nov 1, 2019 5:58:34 PM (5 years ago)

Author:

vboxsync

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

134379

Message:

FE/Qt: bugref:9598: Windows: Adjust mouse integration pointer according to formal/actual device-pixel-ratio and GUI scale-factor.

Location:

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

Files:

• UISession.cpp (modified) (4 diffs)
• UISession.h (modified) (1 diff)

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

@@ -1694 +1694 @@
 
         m_cursorPixmap = QPixmap::fromImage(image);
+        updateMousePointerPixmapScaling(m_cursorPixmap, uXHot, uYHot);
         m_cursor = QCursor(m_cursorPixmap, uXHot, uYHot);
     }
@@ -1784 +1785 @@
 
             m_cursorPixmap = QBitmap::fromImage(bitmap);
+            updateMousePointerPixmapScaling(m_cursorPixmap, uXHot, uYHot);
             m_cursor = QCursor(m_cursorPixmap, QBitmap::fromImage(mask), uXHot, uYHot);
         }
@@ -1815 +1817 @@
 
             m_cursorPixmap = QPixmap::fromImage(image);
+            updateMousePointerPixmapScaling(m_cursorPixmap, uXHot, uYHot);
             m_cursor = QCursor(m_cursorPixmap, uXHot, uYHot);
         }
@@ -1885 +1888 @@
     /* Cache cursor pixmap size: */
     m_cursorSize = m_cursorPixmap.size();
+}
+
+void UISession::updateMousePointerPixmapScaling(QPixmap &pixmap, uint &uXHot, uint &uYHot)
+{
+#if defined(VBOX_WS_WIN)
+
+    /* Get screen-id of active machine-window: */
+    /// @todo In case of multi-monitor setup check whether parameters are screen specific.
+    const ulong uScreenID = activeMachineWindow()->screenId();
+
+    /* We want to scale the pixmap just once, so let's prepare cumulative multiplier: */
+    double dScaleMultiplier = 1.0;
+
+    /* Take into account scale-factor if necessary: */
+    const double dScaleFactor = frameBuffer(uScreenID)->scaleFactor();
+    //printf("Scale-factor: %f\n", dScaleFactor);
+    if (dScaleFactor > 1.0)
+        dScaleMultiplier *= dScaleFactor;
+
+    /* Take into account device-pixel-ratio if necessary: */
+    const double dDevicePixelRatio = frameBuffer(uScreenID)->devicePixelRatio();
+    const double dDevicePixelRatioActual = frameBuffer(uScreenID)->devicePixelRatioActual();
+    const bool fUseUnscaledHiDPIOutput = frameBuffer(uScreenID)->useUnscaledHiDPIOutput();
+    //printf("Device-pixel-ratio/actual: %f/%f, Unscaled HiDPI Output: %d\n",
+    //       dDevicePixelRatio, dDevicePixelRatioActual, fUseUnscaledHiDPIOutput);
+    if (dDevicePixelRatioActual > 1.0 && !fUseUnscaledHiDPIOutput)
+        dScaleMultiplier *= dDevicePixelRatioActual;
+
+    /* If scale multiplier was set: */
+    if (dScaleMultiplier > 1.0)
+    {
+        /* Scale the pixmap up: */
+        pixmap = pixmap.scaled(pixmap.width() * dScaleMultiplier, pixmap.height() * dScaleMultiplier,
+                               Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+        uXHot *= dScaleMultiplier;
+        uYHot *= dScaleMultiplier;
+    }
+
+    /* If device pixel ratio was set: */
+    if (dDevicePixelRatio > 1.0)
+    {
+        /* Scale the pixmap down: */
+        pixmap.setDevicePixelRatio(dDevicePixelRatio);
+        uXHot /= dDevicePixelRatio;
+        uYHot /= dDevicePixelRatio;
+    }
+
+#else
+
+    Q_UNUSED(pixmap);
+    Q_UNUSED(uXHot);
+    Q_UNUSED(uYHot);
+
+#endif
 }
 

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

@@ -444 +444 @@
 #endif /* VBOX_WS_MAC */
 
-    /* Common helpers: */
     /** Updates mouse pointer shape. */
     void updateMousePointerShape();
+    /** Updates mouse pointer @a pixmap, @a uXHot and @a uYHot according to scaling attributes. */
+    void updateMousePointerPixmapScaling(QPixmap &pixmap, uint &uXHot, uint &uYHot);
+
+    /* Common helpers: */
     bool preprocessInitialization();
     bool mountAdHocImage(KDeviceType enmDeviceType, UIMediumDeviceType enmMediumType, const QString &strMediumName);