Changeset 53931 in vbox

Timestamp:

Jan 22, 2015 5:24:21 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: Mac OS X: 6278: Support for unscaled HiDPI (Retina) video-output: Fix absolute mouse positioning for contents shifted with scroll-bars.

Location:

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

Files:

• UIMachineView.cpp (modified) (2 diffs)
• UIMouseHandler.cpp (modified) (2 diffs)

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

@@ -962 +962 @@
 #ifdef Q_WS_MAC
     /* Due to Qt 4.x doesn't supports HiDPI directly
-     * we should take the backing-scale-factor into account: */
+     * we should take the backing-scale-factor into account.
+     * See also viewportToContents()... */
     if (gEDataManager->useUnscaledHiDPIOutput(vboxGlobal().managedVMUuid()))
     {
@@ -983 +984 @@
 QPoint UIMachineView::viewportToContents(const QPoint &vp) const
 {
-    return QPoint(vp.x() + contentsX(), vp.y() + contentsY());
+    /* Get physical contents shifts of scroll-bars: */
+    int iContentsX = contentsX();
+    int iContentsY = contentsY();
+
+#ifdef Q_WS_MAC
+    /* Due to Qt 4.x doesn't supports HiDPI directly
+     * we should take the backing-scale-factor into account.
+     * See also updateSliders()... */
+    if (gEDataManager->useUnscaledHiDPIOutput(vboxGlobal().managedVMUuid()))
+    {
+        const double dBackingScaleFactor = darwinBackingScaleFactor(machineWindow());
+        if (dBackingScaleFactor > 1.0)
+        {
+            iContentsX /= dBackingScaleFactor;
+            iContentsY /= dBackingScaleFactor;
+        }
+    }
+#endif /* Q_WS_MAC */
+
+    /* Return point shifted according scroll-bars: */
+    return QPoint(vp.x() + iContentsX, vp.y() + iContentsY);
 }
 

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

@@ -928 +928 @@
             QPoint cpnt = m_views[uScreenId]->viewportToContents(relativePos);
 
-            /* Determine scaling: */
-            UIFrameBuffer *pFrameBuffer = m_views[uScreenId]->frameBuffer();
-            QSize scaledSize = pFrameBuffer->scaledSize();
-            double xRatio = scaledSize.isValid() ? (double)pFrameBuffer->width() / (double)scaledSize.width() : 1;
-            double yRatio = scaledSize.isValid() ? (double)pFrameBuffer->height() / (double)scaledSize.height() : 1;
-            /* Set scaling if scale-factor is present: */
-            cpnt.setX((int)(cpnt.x() * xRatio));
-            cpnt.setY((int)(cpnt.y() * yRatio));
+            /* Take the scale-factor(s) into account: */
+            const UIFrameBuffer *pFrameBuffer = m_views[uScreenId]->frameBuffer();
+            if (pFrameBuffer)
+            {
+                const QSize scaledSize = pFrameBuffer->scaledSize();
+                if (scaledSize.isValid())
+                {
+                    const double xScaleFactor = (double)scaledSize.width()  / pFrameBuffer->width();
+                    const double yScaleFactor = (double)scaledSize.height() / pFrameBuffer->height();
+                    cpnt.setX(cpnt.x() / xScaleFactor);
+                    cpnt.setY(cpnt.y() / yScaleFactor);
+                }
+            }
+
+#ifdef Q_WS_MAC
+            /* Take the backing-scale-factor into account: */
+            if (gEDataManager->useUnscaledHiDPIOutput(vboxGlobal().managedVMUuid()))
+            {
+                const double dBackingScaleFactor = darwinBackingScaleFactor(m_windows.value(uScreenId));
+                if (dBackingScaleFactor > 1.0)
+                {
+                    cpnt.setX(cpnt.x() * dBackingScaleFactor);
+                    cpnt.setY(cpnt.y() * dBackingScaleFactor);
+                }
+            }
+#endif /* Q_WS_MAC */
 
 #ifdef VBOX_WITH_DRAG_AND_DROP
@@ -969 +987 @@
             cpnt.setX(cpnt.x() + xShift);
             cpnt.setY(cpnt.y() + yShift);
-
-#ifdef Q_WS_MAC
-            /* Take the backing-scale-factor into account: */
-            if (gEDataManager->useUnscaledHiDPIOutput(vboxGlobal().managedVMUuid()))
-            {
-                const double dBackingScaleFactor = darwinBackingScaleFactor(m_windows.value(uScreenId));
-                if (dBackingScaleFactor > 1.0)
-                    cpnt *= dBackingScaleFactor;
-            }
-#endif /* Q_WS_MAC */
 
             /* Post absolute mouse-event into guest: */