Changeset 53499 in vbox

Timestamp:

Dec 10, 2014 1:49:03 PM (10 years ago)

Author:

vboxsync

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

97236

Message:

FE/Qt: 6278: Support for scaled video-output: Seamless mode: Visual regions to be adjusted the proper way.

Location:

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

Files:

• UIFrameBuffer.cpp (modified) (3 diffs)
• UIFrameBuffer.h (modified) (2 diffs)
• UIMachineView.cpp (modified) (4 diffs)

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

@@ -63 +63 @@
     , m_fAutoEnabled(false)
     , m_dScaleFactor(gEDataManager->scaleFactor(vboxGlobal().managedVMUuid()))
+    , m_transform(QTransform().scale(m_dScaleFactor, m_dScaleFactor))
     , m_fUseUnscaledHiDPIOutput(gEDataManager->useUnscaledHiDPIOutput(vboxGlobal().managedVMUuid()))
     , m_hiDPIOptimizationType(HiDPIOptimizationType_None)
@@ -472 +473 @@
         rect.setRight(rects->xRight - 1);
         rect.setBottom(rects->yBottom - 1);
-        /* Tune according scale-factor: */
-        rect.moveTo(rect.topLeft() * m_dScaleFactor);
-        rect.setSize(rect.size() * m_dScaleFactor + QSize(1, 1));
         /* Append region: */
         region += rect;
         ++rects;
     }
+    /* Tune according scale-factor: */
+    if (m_dScaleFactor != 1.0)
+        region = m_transform.map(region);
 
     if (m_fUpdatesAllowed)
@@ -772 +773 @@
     /* Fetch new scale-factor: */
     m_dScaleFactor = gEDataManager->scaleFactor(vboxGlobal().managedVMUuid());
+    m_transform = QTransform().scale(m_dScaleFactor, m_dScaleFactor);
 }
 

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

@@ -21 +21 @@
 #include <QRegion>
 #include <QImage>
+#include <QTransform>
 
 /* GUI includes: */
@@ -293 +294 @@
     /** Holds the scale-factor used by the scaled-size. */
     double m_dScaleFactor;
+    /** Holds the coordinate-system for the scale-factor above. */
+    QTransform m_transform;
     /** Holds the frame-buffer's scaled-size. */
     QSize m_scaledSize;

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

@@ -242 +242 @@
             /* Assign new frame-buffer logical-size taking the scale-factor into account: */
             const double dScaleFactor = gEDataManager->scaleFactor(vboxGlobal().managedVMUuid());
-            frameBuffer()->setScaledSize(dScaleFactor == 1 ? QSize() : QSize(iWidth * dScaleFactor, iHeight * dScaleFactor));
+            frameBuffer()->setScaledSize(dScaleFactor == 1.0 ? QSize() : QSize(iWidth * dScaleFactor, iHeight * dScaleFactor));
         }
 
@@ -296 +296 @@
     /* Take the scale-factor into account: */
     const double dScaleFactor = gEDataManager->scaleFactor(vboxGlobal().managedVMUuid());
-    if (dScaleFactor == 1)
+    if (dScaleFactor == 1.0)
     {
         /* Adjust corresponding viewport part: */
@@ -509 +509 @@
 # endif /* !VBOX_WITH_VIDEOHWACCEL */
         m_pFrameBuffer->setHiDPIOptimizationType(uisession()->hiDPIOptimizationType());
-        m_pFrameBuffer->setScaledSize(dScaleFactor == 1 ? QSize() :
+        m_pFrameBuffer->setScaledSize(dScaleFactor == 1.0 ? QSize() :
                                       QSize(m_pFrameBuffer->width() * dScaleFactor,
                                             m_pFrameBuffer->height() * dScaleFactor));
@@ -1166 +1166 @@
         QPainter painter(viewport());
         /* Take the scale-factor into account: */
-        if (gEDataManager->scaleFactor(vboxGlobal().managedVMUuid()) == 1)
+        if (gEDataManager->scaleFactor(vboxGlobal().managedVMUuid()) == 1.0)
             painter.drawPixmap(rect, pausePixmap(), QRect(rect.x() + contentsX(), rect.y() + contentsY(),
                                                           rect.width(), rect.height()));