Changeset 53520 in vbox for trunk/src/VBox

Timestamp:

Dec 12, 2014 10:47:13 AM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: Mac OS X: 6278: Support for unscaled HiDPI (Retina) video-output: Seamless mode: Separate erase-method for HiDPI-aware screens.

Location:

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

Files:

• UIFrameBuffer.cpp (modified) (7 diffs)
• UIFrameBuffer.h (modified) (1 diff)

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

@@ -865 +865 @@
 void UIFrameBuffer::paintDefault(QPaintEvent *pEvent)
 {
-    /* Prepare the 'paint' rectangle: */
-    QRect paintRect = pEvent->rect();
-
-    /* Take the backing-scale-factor into account: */
-    if (useUnscaledHiDPIOutput() && backingScaleFactor() > 1.0)
-    {
-        paintRect.moveTo(paintRect.topLeft() * backingScaleFactor());
-        paintRect.setSize(paintRect.size() * backingScaleFactor());
-    }
-
     /* Scaled image is NULL by default: */
     QImage scaledImage;
@@ -889 +879 @@
     const QImage &sourceImage = scaledImage.isNull() ? m_image : scaledImage;
 
+    /* Prepare the 'paint' rectangle: */
+    QRect paintRect = pEvent->rect();
+
+    /* Take the backing-scale-factor into account: */
+    if (useUnscaledHiDPIOutput() && backingScaleFactor() > 1.0)
+    {
+        paintRect.moveTo(paintRect.topLeft() * backingScaleFactor());
+        paintRect.setSize(paintRect.size() * backingScaleFactor());
+    }
+
     /* Make sure paint-rectangle is within the image boundary: */
     paintRect = paintRect.intersected(sourceImage.rect());
@@ -905 +905 @@
 void UIFrameBuffer::paintSeamless(QPaintEvent *pEvent)
 {
-    /* Prepare the 'paint' rectangle: */
-    QRect paintRect = pEvent->rect();
-
-    /* Take the backing-scale-factor into account: */
-    if (useUnscaledHiDPIOutput() && backingScaleFactor() > 1.0)
-    {
-        paintRect.moveTo(paintRect.topLeft() * backingScaleFactor());
-        paintRect.setSize(paintRect.size() * backingScaleFactor());
-    }
-
     /* Scaled image is NULL by default: */
     QImage scaledImage;
@@ -929 +919 @@
     const QImage &sourceImage = scaledImage.isNull() ? m_image : scaledImage;
 
+    /* Prepare the 'paint' rectangle: */
+    QRect paintRect = pEvent->rect();
+
+    /* Take the backing-scale-factor into account: */
+    if (useUnscaledHiDPIOutput() && backingScaleFactor() > 1.0)
+    {
+        paintRect.moveTo(paintRect.topLeft() * backingScaleFactor());
+        paintRect.setSize(paintRect.size() * backingScaleFactor());
+    }
+
     /* Make sure paint-rectangle is within the image boundary: */
     paintRect = paintRect.intersected(sourceImage.rect());
@@ -947 +947 @@
         /* Erase required region, slowly, rectangle-by-rectangle: */
         foreach (const QRect &rect, regionToErase.rects())
-            painter.eraseRect(rect);
+            eraseImageRect(painter, rect,
+                           useUnscaledHiDPIOutput(), hiDPIOptimizationType(), backingScaleFactor());
         /* Restore composition-mode: */
         painter.setCompositionMode(QPainter::CompositionMode_SourceOver);
@@ -981 +982 @@
 
 /* static */
+void UIFrameBuffer::eraseImageRect(QPainter &painter, const QRect &rect,
+                                   bool fUseUnscaledHiDPIOutput,
+                                   HiDPIOptimizationType hiDPIOptimizationType,
+                                   double dBackingScaleFactor)
+{
+    /* Prepare sub-pixmap: */
+    QPixmap subPixmap = QPixmap(rect.width(), rect.height());
+
+    /* If HiDPI 'backing scale factor' defined: */
+    if (dBackingScaleFactor > 1.0)
+    {
+        /* Should we
+         * perform logical HiDPI scaling and optimize it for performance? */
+        if (!fUseUnscaledHiDPIOutput && hiDPIOptimizationType == HiDPIOptimizationType_Performance)
+        {
+            /* Adjust sub-pixmap: */
+            subPixmap = QPixmap(rect.width() * dBackingScaleFactor,
+                                rect.height() * dBackingScaleFactor);
+        }
+
+#ifdef Q_WS_MAC
+# ifdef VBOX_GUI_WITH_HIDPI
+        /* Should we
+         * do not perform logical HiDPI scaling or
+         * perform logical HiDPI scaling and optimize it for performance? */
+        if (fUseUnscaledHiDPIOutput || hiDPIOptimizationType == HiDPIOptimizationType_Performance)
+        {
+            /* Mark sub-pixmap as HiDPI: */
+            subPixmap.setDevicePixelRatio(dBackingScaleFactor);
+        }
+# endif /* VBOX_GUI_WITH_HIDPI */
+#endif /* Q_WS_MAC */
+    }
+
+    /* Which point we should draw corresponding sub-pixmap? */
+    QPointF paintPoint = rect.topLeft();
+
+    /* Take the backing-scale-factor into account: */
+    if (fUseUnscaledHiDPIOutput && dBackingScaleFactor > 1.0)
+        paintPoint /= dBackingScaleFactor;
+
+    /* Draw sub-pixmap: */
+    painter.drawPixmap(paintPoint, subPixmap);
+}
+
+/* static */
 void UIFrameBuffer::drawImageRect(QPainter &painter, const QImage &image, const QRect &rect,
                                   int iContentsShiftX, int iContentsShiftY,
@@ -1031 +1078 @@
 
     /* Which point we should draw corresponding sub-pixmap? */
-    QPoint paintPoint = rect.topLeft();
+    QPointF paintPoint = rect.topLeft();
 
     /* Take the backing-scale-factor into account: */

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

@@ -252 +252 @@
     void paintSeamless(QPaintEvent *pEvent);
 
+    /** Erases corresponding @a rect with @a painter. */
+    static void eraseImageRect(QPainter &painter, const QRect &rect,
+                               bool fUseUnscaledHiDPIOutput,
+                               HiDPIOptimizationType hiDPIOptimizationType,
+                               double dBackingScaleFactor);
     /** Draws corresponding @a rect of passed @a image with @a painter. */
     static void drawImageRect(QPainter &painter, const QImage &image, const QRect &rect,