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

Timestamp:

Dec 8, 2017 11:02:07 AM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8694: X11: Adjusting mouse cursor shape to be HiPDI aware and take host-screen scale-factor into account.

File:

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

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

@@ -1779 +1779 @@
     /* Create cursor-pixmap from the image: */
     QPixmap cursorPixmap = QPixmap::fromImage(image);
-# ifdef VBOX_WS_MAC
+
+# if defined(VBOX_WS_MAC)
     /* Adjust device-pixel-ratio: */
     /// @todo In case of multi-monitor setup check whether device-pixel-ratio and cursor are screen specific.
@@ -1793 +1794 @@
         cursorPixmap.setDevicePixelRatio(dDevicePixelRatio);
     }
-# endif /* VBOX_WS_MAC */
+# elif 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 = machineLogic()->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;
+        cursorPixmap = cursorPixmap.scaled(cursorPixmap.width() * dDevicePixelRatio, cursorPixmap.height() * dDevicePixelRatio,
+                                           Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+    }
+# endif /* VBOX_WS_X11 */
+
     /* Set the new cursor: */
     m_cursor = QCursor(cursorPixmap, uXHot, uYHot);