Changeset 47058 in vbox for trunk/src/VBox

Timestamp:

Jul 9, 2013 4:18:57 PM (12 years ago)

Author:

vboxsync

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

87102

Message:

FE/Qt: QImage frame-buffer: Do not clear part of painted region which will be repainted anyway.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferQImage.cpp (modified) (1 diff)

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

@@ -226 +226 @@
     QPainter painter(m_pMachineView->viewport());
 
-    /* Clear paint rectangle first: */
-    painter.setCompositionMode(QPainter::CompositionMode_Clear);
-    painter.eraseRect(paintRect);
-    painter.setCompositionMode(QPainter::CompositionMode_SourceOver);
-
-    /* Manually clip paint rectangle using visible-region: */
+    /* Determine the region to erase: */
     lock();
-    QRegion visiblePaintRegion = m_syncVisibleRegion & paintRect;
+    QRegion regionToErase = (QRegion)paintRect - m_syncVisibleRegion;
     unlock();
-
-    /* Repaint all the rectangles of visible-region: */
-    foreach (const QRect &rect, visiblePaintRegion.rects())
-    {
+    if (!regionToErase.isEmpty())
+    {
+        /* Optimize composition-mode: */
+        painter.setCompositionMode(QPainter::CompositionMode_Clear);
+        /* Erase required region, slowly, rectangle-by-rectangle: */
+        foreach (const QRect &rect, regionToErase.rects())
+            painter.eraseRect(rect);
+        /* Restore composition-mode: */
+        painter.setCompositionMode(QPainter::CompositionMode_SourceOver);
+    }
+
+    /* Determine the region to paint: */
+    lock();
+    QRegion regionToPaint = (QRegion)paintRect & m_syncVisibleRegion;
+    unlock();
+    if (!regionToPaint.isEmpty())
+    {
+        /* Paint required region, slowly, rectangle-by-rectangle: */
+        foreach (const QRect &rect, regionToPaint.rects())
+        {
 #ifdef Q_WS_WIN
-        /* Replace translucent background with black one,
-         * that is necessary for window with Qt::WA_TranslucentBackground: */
-        painter.setCompositionMode(QPainter::CompositionMode_Source);
-        painter.fillRect(rect, QColor(Qt::black));
-        painter.setCompositionMode(QPainter::CompositionMode_SourceAtop);
+            /* Replace translucent background with black one,
+             * that is necessary for window with Qt::WA_TranslucentBackground: */
+            painter.setCompositionMode(QPainter::CompositionMode_Source);
+            painter.fillRect(rect, QColor(Qt::black));
+            painter.setCompositionMode(QPainter::CompositionMode_SourceAtop);
 #endif /* Q_WS_WIN */
 
-        /* Draw image rectangle depending on rectangle width: */
-        if ((ulong)rect.width() < m_width * 2 / 3)
-            drawImageRectNarrow(painter, m_img,
-                                rect, m_pMachineView->contentsX(), m_pMachineView->contentsY());
-        else
-            drawImageRectWide(painter, m_img,
-                              rect, m_pMachineView->contentsX(), m_pMachineView->contentsY());
+            /* Draw image rectangle depending on rectangle width: */
+            if ((ulong)rect.width() < m_width * 2 / 3)
+                drawImageRectNarrow(painter, m_img,
+                                    rect, m_pMachineView->contentsX(), m_pMachineView->contentsY());
+            else
+                drawImageRectWide(painter, m_img,
+                                  rect, m_pMachineView->contentsX(), m_pMachineView->contentsY());
+        }
     }
 }