Changeset 71030 in vbox

Timestamp:

Feb 15, 2018 3:34:31 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8694: Runtime UI: Framebuffer: A bit of cleanup for painting routines.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp (modified) (6 diffs)

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

@@ -1351 +1351 @@
     /* Scaled image is NULL by default: */
     QImage scaledImage;
-    /* But if scaled-factor is set and current image is NOT null: */
+    /* But if scale-factor is set and current image is NOT null: */
     if (m_scaledSize.isValid() && !m_image.isNull())
     {
@@ -1357 +1357 @@
          * detached during scale process, otherwise we can get a frozen frame-buffer. */
         scaledImage = m_image.copy();
-        /* And scaling the image to predefined scaled-factor: */
+        /* And scaling the image to predefined scale-factor: */
         switch (m_pMachineView->visualStateType())
         {
@@ -1392 +1392 @@
 
 #ifdef VBOX_WS_MAC
-    /* On OSX for Qt5 we need to erase backing store first: */
-    QRect eraseRect = paintRect;
-    /* Take the device-pixel-ratio into account: */
-    if (useUnscaledHiDPIOutput() && devicePixelRatio() > 1.0)
-    {
-        eraseRect.moveTo(eraseRect.topLeft() / devicePixelRatio());
-        eraseRect.setSize(eraseRect.size() / devicePixelRatio());
-    }
-    /* Replace translucent background with black one: */
+    /* On OSX for Qt5 we need to fill the backing store first: */
     painter.setCompositionMode(QPainter::CompositionMode_Source);
-    painter.fillRect(eraseRect, QColor(Qt::black));
+    painter.fillRect(pEvent->rect(), QColor(Qt::black));
     painter.setCompositionMode(QPainter::CompositionMode_SourceAtop);
 #endif /* VBOX_WS_MAC */
@@ -1420 +1412 @@
     /* Scaled image is NULL by default: */
     QImage scaledImage;
-    /* But if scaled-factor is set and current image is NOT null: */
+    /* But if scale-factor is set and current image is NOT null: */
     if (m_scaledSize.isValid() && !m_image.isNull())
     {
@@ -1426 +1418 @@
          * detached during scale process, otherwise we can get a frozen frame-buffer. */
         scaledImage = m_image.copy();
-        /* And scaling the image to predefined scaled-factor: */
+        /* And scaling the image to predefined scale-factor: */
         switch (m_pMachineView->visualStateType())
         {
@@ -1483 +1475 @@
     painter.setCompositionMode(QPainter::CompositionMode_SourceOver);
 
-#if defined(VBOX_WITH_TRANSLUCENT_SEAMLESS)
-    /* On OSX for Qt5 we need to erase backing store first: */
-    QRect eraseRect = paintRect;
-    /* Take the device-pixel-ratio into account: */
-    if (useUnscaledHiDPIOutput() && devicePixelRatio() > 1.0)
-    {
-        eraseRect.moveTo(eraseRect.topLeft() / devicePixelRatio());
-        eraseRect.setSize(eraseRect.size() / devicePixelRatio());
-    }
-    /* Replace translucent background with black one: */
+#ifdef VBOX_WITH_TRANSLUCENT_SEAMLESS
+    /* In case of translucent seamless for Qt5 we need to fill the backing store first: */
     painter.setCompositionMode(QPainter::CompositionMode_Source);
-    painter.fillRect(eraseRect, QColor(Qt::black));
+    painter.fillRect(pEvent->rect(), QColor(Qt::black));
     painter.setCompositionMode(QPainter::CompositionMode_SourceAtop);
 #endif /* VBOX_WITH_TRANSLUCENT_SEAMLESS */