Changeset 93235 in vbox

Timestamp:

Jan 14, 2022 2:31:22 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9996: Enable watermark for expert wizard mode as well.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/wizards/UINativeWizard.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/UINativeWizard.cpp

@@ -152 +152 @@
 
     /* Adjust page layout: */
-    const int iL = m_enmMode == WizardMode_Expert
-                 ? qApp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin)
-                 : 0;
-    const int iT = m_enmMode == WizardMode_Expert
-                 ? qApp->style()->pixelMetric(QStyle::PM_LayoutTopMargin)
-                 : 0;
+    const int iL = 0;
+    const int iT = 0;
     const int iR = qApp->style()->pixelMetric(QStyle::PM_LayoutRightMargin);
     const int iB = qApp->style()->pixelMetric(QStyle::PM_LayoutBottomMargin);
@@ -568 +564 @@
 void UINativeWizard::resizeToGoldenRatio()
 {
-    /* Standard top margin for Basic mode case: */
-    const int iT = m_enmMode == WizardMode_Basic
-                 ? qApp->style()->pixelMetric(QStyle::PM_LayoutTopMargin)
-                 : 0;
+    /* Standard top margin: */
+    const int iT = qApp->style()->pixelMetric(QStyle::PM_LayoutTopMargin);
     m_pLayoutRight->setContentsMargins(0, iT, 0, 0);
     /* Show title label for Basic mode case: */
@@ -577 +571 @@
 #ifndef VBOX_WS_MAC
     /* Hide/show pixmap label on Windows/X11 only, on macOS it's in the background: */
-    m_pLabelPixmap->setVisible(!m_strPixmapName.isEmpty() && m_enmMode == WizardMode_Basic);
+    m_pLabelPixmap->setVisible(!m_strPixmapName.isEmpty());
 #endif /* !VBOX_WS_MAC */
 
@@ -636 +630 @@
 #else
     /* Assign watermark finally: */
-    if (   !m_strPixmapName.isEmpty()
-        && m_enmMode == WizardMode_Basic)
+    if (!m_strPixmapName.isEmpty())
         assignWatermark();
 #endif /* !VBOX_WS_MAC */