Changeset 26119 in vbox

Timestamp:

Feb 1, 2010 1:33:15 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: A couple of fixes for wizards parent class: using picture's palette color to paint watermark frame; take into account button's height when calculating watermark's height.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIWizard.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIWizard.cpp

@@ -22 +22 @@
 
 /* Global includes */
+#include <QAbstractButton>
 #include <QLayout>
 #include <QTextEdit>
@@ -60 +61 @@
     QImage imgWatermark = pixWaterMark.toImage();
 
+    /* Use the right-top watermark pixel as frame color */
+    QRgb rgbFrame = imgWatermark.pixel(imgWatermark.width() - 1, 0);
+
+    /* Take into account button's height */
+    int iPageHeight = height() - button(QWizard::CancelButton)->height();
+
     /* Create final image on the basis of incoming, applying the rules. */
-    QImage imgWatermarkNew(imgWatermark.width(), qMax(imgWatermark.height(), height()), imgWatermark.format());
+    QImage imgWatermarkNew(imgWatermark.width(), qMax(imgWatermark.height(), iPageHeight), imgWatermark.format());
     for (int y = 0; y < imgWatermarkNew.height(); ++ y)
     {
@@ -69 +76 @@
             if (wizardStyle() == QWizard::ClassicStyle &&
                 (x == 0 || y == 0 || x == imgWatermarkNew.width() - 1 || y == imgWatermarkNew.height() - 1))
-                imgWatermarkNew.setPixel(x, y, qRgb(0, 0, 0));
+                imgWatermarkNew.setPixel(x, y, rgbFrame);
             /* Border rule 2 - draw border for ModernStyle */
             else if (wizardStyle() == QWizard::ModernStyle && x == imgWatermarkNew.width() - 1)
-                imgWatermarkNew.setPixel(x, y, qRgb(0, 0, 0));
+                imgWatermarkNew.setPixel(x, y, rgbFrame);
             /* Horizontal extension rule - use last used color */
             else if (x >= imgWatermark.width() && y < imgWatermark.height())