Changeset 53522 in vbox for trunk/src/VBox

Timestamp:

Dec 12, 2014 11:09:56 AM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: Runtime UI: Frame-buffer: Some cleanup for painting routine.

File:

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

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

@@ -1037 +1037 @@
                              image.bytesPerLine(), image.format());
 
-#ifndef QIMAGE_FRAMEBUFFER_WITH_DIRECT_OUTPUT
     /* Create sub-pixmap on the basis of sub-image above (1st copy involved): */
     QPixmap subPixmap = QPixmap::fromImage(subImage);
@@ -1053 +1052 @@
         }
 
-# ifdef Q_WS_MAC
-#  ifdef VBOX_GUI_WITH_HIDPI
+#ifdef Q_WS_MAC
+# ifdef VBOX_GUI_WITH_HIDPI
         /* Should we
          * do not perform logical HiDPI scaling or
@@ -1063 +1062 @@
             subPixmap.setDevicePixelRatio(dBackingScaleFactor);
         }
-#  endif /* VBOX_GUI_WITH_HIDPI */
-# endif /* Q_WS_MAC */
+# endif /* VBOX_GUI_WITH_HIDPI */
+#endif /* Q_WS_MAC */
     }
 
@@ -1076 +1075 @@
     /* Draw sub-pixmap: */
     painter.drawPixmap(paintPoint, subPixmap);
-#else /* QIMAGE_FRAMEBUFFER_WITH_DIRECT_OUTPUT */
-    /* If HiDPI 'backing scale factor' defined: */
-    if (dBackingScaleFactor > 1.0)
-    {
-        /* Should we optimize HiDPI output for performance? */
-        if (hiDPIOptimizationType == HiDPIOptimizationType_Performance)
-        {
-            /* Create fast-scaled-sub-image (1st copy involved): */
-            QImage scaledSubImage = subImage.scaled(subImage.size() * dBackingScaleFactor,
-                                                    Qt::IgnoreAspectRatio, Qt::FastTransformation);
-# ifdef Q_WS_MAC
-#  ifdef VBOX_GUI_WITH_HIDPI
-            /* Mark sub-pixmap as HiDPI: */
-            scaledSubImage.setDevicePixelRatio(dBackingScaleFactor);
-#  endif /* VBOX_GUI_WITH_HIDPI */
-# endif /* Q_WS_MAC */
-            /* Directly draw scaled-sub-image: */
-            painter.drawImage(rect.x(), rect.y(), scaledSubImage);
-            return;
-        }
-    }
-    /* Directly draw sub-image: */
-    painter.drawImage(rect.x(), rect.y(), subImage);
-#endif /* QIMAGE_FRAMEBUFFER_WITH_DIRECT_OUTPUT */
-}
-
+}
+