Changeset 81826 in vbox

Timestamp:

Nov 13, 2019 1:36:00 PM (5 years ago)

Author:

vboxsync

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

134617

Message:

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

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp (modified) (5 diffs)

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

@@ -1844 +1844 @@
     m_cursorPixmap = QPixmap::fromImage(image);
     updateMousePointerPixmapScaling(m_cursorPixmap, uXHot, uYHot);
-
-# if defined(VBOX_WS_X11)
-    /* Adjust device-pixel-ratio: */
-    /// @todo In case of multi-monitor setup check whether device-pixel-ratio and cursor are screen specific.
-    /* Get screen-id of main-window: */
-    const ulong uScreenID = activeMachineWindow()->screenId();
-    /* Get device-pixel-ratio: */
-    const double dDevicePixelRatio = frameBuffer(uScreenID)->devicePixelRatio();
-    /* Adjust device-pixel-ratio if necessary: */
-    if (dDevicePixelRatio > 1.0 && !frameBuffer(uScreenID)->useUnscaledHiDPIOutput())
-    {
-        uXHot *= dDevicePixelRatio;
-        uYHot *= dDevicePixelRatio;
-        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(m_cursorPixmap, uXHot, uYHot);
     m_fIsValidPointerShapePresent = true;
@@ -1910 +1891 @@
     }
 
-#elif defined(VBOX_WS_WIN)
+#elif defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
 
     /* Get screen-id of active machine-window: */
@@ -1926 +1907 @@
 
     /* Take into account device-pixel-ratio if necessary: */
+# ifdef VBOX_WS_WIN
     const double dDevicePixelRatio = frameBuffer(uScreenID)->devicePixelRatio();
+# endif
     const double dDevicePixelRatioActual = frameBuffer(uScreenID)->devicePixelRatioActual();
     const bool fUseUnscaledHiDPIOutput = frameBuffer(uScreenID)->useUnscaledHiDPIOutput();
@@ -1944 +1927 @@
     }
 
+# ifdef VBOX_WS_WIN
     /* If device pixel ratio was set: */
     if (dDevicePixelRatio > 1.0)
@@ -1952 +1936 @@
         uYHot /= dDevicePixelRatio;
     }
+# endif
 
 #else