Changeset 70530 in vbox for trunk/src

Timestamp:

Jan 11, 2018 10:39:18 AM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8694: Runtime UI: A bit of layout fixes for VM close dialog.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIVMCloseDialog.cpp (modified) (7 diffs)

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

@@ -174 +174 @@
     QVBoxLayout *pMainLayout = new QVBoxLayout(this);
     {
+        /* Configure layout: */
+#ifdef VBOX_WS_MAC
+        pMainLayout->setContentsMargins(40, 20, 40, 20);
+        pMainLayout->setSpacing(15);
+#else
+        pMainLayout->setSpacing(qApp->style()->pixelMetric(QStyle::PM_LayoutVerticalSpacing) * 2);
+#endif
+
         /* Prepare 'top' layout: */
         QHBoxLayout *pTopLayout = new QHBoxLayout;
         {
+            /* Configure layout: */
+#ifdef VBOX_WS_MAC
+            pTopLayout->setSpacing(20);
+#else
+            pTopLayout->setSpacing(qApp->style()->pixelMetric(QStyle::PM_LayoutHorizontalSpacing) * 2);
+#endif
+
             /* Prepare 'top-left' layout: */
             QVBoxLayout *pTopLeftLayout = new QVBoxLayout;
@@ -189 +204 @@
                     m_pIcon->setPixmap(icon.pixmap(iIconMetric, iIconMetric));
                 }
-                /* Configure layout: */
-                pTopLeftLayout->setContentsMargins(0, 0, 0, 0);
+
+                /* Add into layout: */
                 pTopLeftLayout->addWidget(m_pIcon);
                 pTopLeftLayout->addStretch();
@@ -198 +213 @@
             {
                 /* Configure layout: */
-                // WORKAROUND:
-                // Why do we need it? It should be the default one, but it's not..
 #ifdef VBOX_WS_MAC
                 pTopRightLayout->setSpacing(10);
@@ -212 +225 @@
                 {
                     /* Configure layout: */
-                    // WORKAROUND:
-                    // Why do we need it? It should be the default one, but it's not..
 #ifdef VBOX_WS_MAC
                     pChoiceLayout->setSpacing(10);
@@ -284 +295 @@
                     /* Prepare 'discard' check-box: */
                     m_pDiscardCheckBox = new QCheckBox(this);
-                    /* Configure layout: */
-                    pChoiceLayout->setContentsMargins(0, 0, 0, 0);
+
+                    /* Add into layout: */
                     pChoiceLayout->addWidget(m_pDetachIcon, 0, 0);
                     pChoiceLayout->addWidget(m_pDetachRadio, 0, 1);
@@ -296 +307 @@
                     pChoiceLayout->addWidget(m_pDiscardCheckBox, 4, 1);
                 }
-                /* Configure layout: */
-                pTopRightLayout->setContentsMargins(0, 0, 0, 0);
+
+                /* Add into layout: */
                 pTopRightLayout->addWidget(m_pLabel);
                 pTopRightLayout->addItem(pChoiceLayout);
             }
-            /* Configure layout: */
-            pTopLayout->setContentsMargins(0, 0, 0, 0);
-#ifdef VBOX_WS_MAC
-            pTopLayout->setSpacing(20);
-#else
-            pTopLayout->setSpacing(qApp->style()->pixelMetric(QStyle::PM_LayoutHorizontalSpacing) * 2);
-#endif
+
+            /* Add into layout: */
             pTopLayout->addItem(pTopLeftLayout);
             pTopLayout->addItem(pTopRightLayout);
         }
+
         /* Prepare button-box: */
         QIDialogButtonBox *pButtonBox = new QIDialogButtonBox(this);
@@ -320 +327 @@
             connect(pButtonBox, SIGNAL(helpRequested()), &msgCenter(), SLOT(sltShowHelpHelpDialog()));
         }
-        /* Configure layout: */
-#ifdef VBOX_WS_MAC
-        pMainLayout->setContentsMargins(40, 20, 40, 20);
-#endif /* VBOX_WS_MAC */
+
+        /* Add into layout: */
         pMainLayout->addItem(pTopLayout);
         pMainLayout->addWidget(pButtonBox);