Changeset 33189 in vbox for trunk

Timestamp:

Oct 18, 2010 9:57:33 AM (14 years ago)

Author:

vboxsync

Message:

FE/Qt4: Make sure there is enough room when painting the preview bg/glossy image.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMPreviewWindow.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMPreviewWindow.cpp

@@ -148 +148 @@
     QRect cr = contentsRect();
     /* Draw the background with the monitor and the shadow */
-    painter.drawImage(cr.x(), cr.y(), *m_pbgImage);
+    if (m_pbgImage)
+        painter.drawImage(cr.x(), cr.y(), *m_pbgImage);
 //    painter.setPen(Qt::red);
 //    painter.drawRect(cr.adjusted(0, 0, -1, -1));
@@ -185 +186 @@
     }
     /* Draw the glossy overlay last */
-    painter.drawImage(m_vRect.x(), m_vRect.y(), *m_pGlossyImg);
+    if (m_pGlossyImg)
+        painter.drawImage(m_vRect.x(), m_vRect.y(), *m_pGlossyImg);
 }
 
@@ -388 +390 @@
 void UIVMPreviewWindow::repaintBGImages()
 {
+    /* Delete the old images */
+    if (m_pbgImage)
+        delete m_pbgImage;
+    if (m_pGlossyImg)
+        delete m_pGlossyImg;
+
+    /* Check that there is enough room for our fancy stuff. If not we just
+     * draw nothing. */
+    QRect cr = contentsRect();
+    if (   cr.width()  < 30
+        || cr.height() < 30)
+        return;
+
     QPalette pal = palette();
-    QRect cr = contentsRect();
     m_wRect = cr.adjusted(10, 10, -10, -10);
     m_vRect = m_wRect.adjusted(m_vMargin, m_vMargin, -m_vMargin, -m_vMargin).adjusted(-3, -3, 3, 3);
@@ -425 +439 @@
 #endif
     /* Make a copy of the new bg image */
-    if (m_pbgImage)
-        delete m_pbgImage;
     m_pbgImage = new QImage(imageO);
 
@@ -441 +453 @@
 
     /* Paint the glossy path on a QImage */
-    if (m_pGlossyImg)
-        delete m_pGlossyImg;
     QImage image(m_vRect.size(), QImage::Format_ARGB32);
     QColor bg1(Qt::white); /* We want blur to transparent _and_ white. */