Index: /trunk/src/VBox/Frontends/VirtualBox/src/UITakeSnapshotDialog.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/UITakeSnapshotDialog.cpp (revision 69820) +++ /trunk/src/VBox/Frontends/VirtualBox/src/UITakeSnapshotDialog.cpp (revision 69821) @@ -25,4 +25,5 @@ # include # include +# include /* GUI includes: */ @@ -100,7 +101,4 @@ AssertPtrReturnVoid(pLayout); { - /* Configure layout: */ - pLayout->setSpacing(20); - /* Create sub-layout: */ QVBoxLayout *pSubLayout1 = new QVBoxLayout; @@ -130,5 +128,6 @@ { /* Configure layout: */ - pSubLayout2->setSpacing(10); + const int iS = qApp->style()->pixelMetric(QStyle::PM_LayoutVerticalSpacing) / 2; + pSubLayout2->setSpacing(iS); /* Create name label: */ @@ -162,5 +161,6 @@ { /* Configure layout: */ - pSubLayout3->setSpacing(10); + const int iS = qApp->style()->pixelMetric(QStyle::PM_LayoutVerticalSpacing) / 2; + pSubLayout3->setSpacing(iS); /* Create description label: */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowSplitter.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowSplitter.cpp (revision 69820) +++ /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowSplitter.cpp (revision 69821) @@ -236,5 +236,6 @@ /* Configure main-layout: */ m_pMainLayout->setContentsMargins(0, 0, 0, 0); - m_pMainLayout->setSpacing(3); + const int iS = qApp->style()->pixelMetric(QStyle::PM_LayoutVerticalSpacing) / 2; + m_pMainLayout->setSpacing(iS); /* Create button-layout: */ QHBoxLayout *pButtonLayout = new QHBoxLayout; Index: /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIMessageBox.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIMessageBox.cpp (revision 69820) +++ /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIMessageBox.cpp (revision 69821) @@ -181,5 +181,4 @@ /* Configure top-layout: */ pTopLayout->setContentsMargins(0, 0, 0, 0); - pTopLayout->setSpacing(10); /* Create icon-label: */ m_pLabelIcon = new QLabel; Index: /trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkManager.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkManager.cpp (revision 69820) +++ /trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkManager.cpp (revision 69821) @@ -815,5 +815,6 @@ layout()->setSpacing(10); #else - layout()->setSpacing(4); + const int iS = qApp->style()->pixelMetric(QStyle::PM_LayoutVerticalSpacing) / 2; + layout()->setSpacing(iS); #endif Index: /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp (revision 69820) +++ /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp (revision 69821) @@ -1522,5 +1522,6 @@ layout()->setSpacing(10); #else - layout()->setSpacing(4); + const int iS = qApp->style()->pixelMetric(QStyle::PM_LayoutVerticalSpacing) / 2; + layout()->setSpacing(iS); #endif Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp (revision 69820) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp (revision 69821) @@ -1286,5 +1286,6 @@ /* Configure main-layout: */ m_pMainLayout->setContentsMargins(0, 0, 0, 0); - m_pMainLayout->setSpacing(5); + const int iS = qApp->style()->pixelMetric(QStyle::PM_LayoutHorizontalSpacing) / 2; + m_pMainLayout->setSpacing(iS); /* Update pool: */ updatePool(); Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIStatusBarEditorWindow.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIStatusBarEditorWindow.cpp (revision 69820) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIStatusBarEditorWindow.cpp (revision 69821) @@ -545,5 +545,6 @@ /* Configure button-layout: */ m_pButtonLayout->setContentsMargins(0, 0, 0, 0); - m_pButtonLayout->setSpacing(5); + const int iS = qApp->style()->pixelMetric(QStyle::PM_LayoutHorizontalSpacing) / 2; + m_pButtonLayout->setSpacing(iS); /* Add button-layout into main-layout: */ m_pMainLayout->addLayout(m_pButtonLayout); Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIVMCloseDialog.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIVMCloseDialog.cpp (revision 69820) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIVMCloseDialog.cpp (revision 69821) @@ -190,5 +190,4 @@ } /* Configure layout: */ - pTopLeftLayout->setSpacing(0); pTopLeftLayout->setContentsMargins(0, 0, 0, 0); pTopLeftLayout->addWidget(m_pIcon); @@ -198,4 +197,10 @@ QVBoxLayout *pTopRightLayout = new QVBoxLayout; { + /* Configure layout: */ + // WORKAROUND: + // Why do we need it? It should be the default one, but it's not.. + const int iS1 = qApp->style()->pixelMetric(QStyle::PM_LayoutVerticalSpacing); + pTopRightLayout->setSpacing(iS1); + /* Prepare 'text' label: */ m_pLabel = new QLabel(this); @@ -203,4 +208,10 @@ QGridLayout *pChoiceLayout = new QGridLayout; { + /* Configure layout: */ + // WORKAROUND: + // Why do we need it? It should be the default one, but it's not.. + const int iS2 = qApp->style()->pixelMetric(QStyle::PM_LayoutVerticalSpacing); + pChoiceLayout->setSpacing(iS2); + /* Prepare icon metric: */ const int iIconMetric = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize); @@ -270,7 +281,5 @@ #ifdef VBOX_WS_MAC pChoiceLayout->setSpacing(15); -#else /* VBOX_WS_MAC */ - pChoiceLayout->setSpacing(6); -#endif /* !VBOX_WS_MAC */ +#endif pChoiceLayout->setContentsMargins(0, 0, 0, 0); pChoiceLayout->addWidget(m_pDetachIcon, 0, 0); @@ -287,7 +296,5 @@ #ifdef VBOX_WS_MAC pTopRightLayout->setSpacing(15); -#else /* VBOX_WS_MAC */ - pTopRightLayout->setSpacing(6); -#endif /* !VBOX_WS_MAC */ +#endif pTopRightLayout->setContentsMargins(0, 0, 0, 0); pTopRightLayout->addWidget(m_pLabel); @@ -295,6 +302,9 @@ } /* Configure layout: */ - pTopLayout->setSpacing(20); pTopLayout->setContentsMargins(0, 0, 0, 0); + // WORKAROUND: + // Why do we need it? It should be the default one, but it's not.. + const int iS3 = qApp->style()->pixelMetric(QStyle::PM_LayoutHorizontalSpacing); + pTopLayout->setSpacing(iS3); pTopLayout->addItem(pTopLeftLayout); pTopLayout->addItem(pTopRightLayout); @@ -310,5 +320,4 @@ } /* Configure layout: */ - pMainLayout->setSpacing(20); #ifdef VBOX_WS_MAC pMainLayout->setContentsMargins(40, 20, 40, 20); Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISnapshotPane.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISnapshotPane.cpp (revision 69820) +++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISnapshotPane.cpp (revision 69821) @@ -1242,5 +1242,6 @@ layout()->setSpacing(10); #else - layout()->setSpacing(4); + const int iS = qApp->style()->pixelMetric(QStyle::PM_LayoutVerticalSpacing) / 2; + layout()->setSpacing(iS); #endif Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.cpp (revision 69820) +++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.cpp (revision 69821) @@ -103,5 +103,4 @@ pMainLayout->addWidget(m_pSelector->widget(), 0, 0, 2, 1); m_pSelector->widget()->setFocus(); - pMainLayout->setSpacing(10); #endif /* VBOX_GUI_WITH_TOOLBAR_SETTINGS */ connect(m_pSelector, SIGNAL(sigCategoryChanged(int)), this, SLOT(sltCategoryChanged(int))); Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp (revision 69820) +++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp (revision 69821) @@ -3450,4 +3450,7 @@ mLtStorage->setContentsMargins(3, 0, 3, 0); mLtStorage->setSpacing(3); +#else + const int iS = qApp->style()->pixelMetric(QStyle::PM_LayoutVerticalSpacing) / 3; + mLtStorage->setSpacing(iS); #endif Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.cpp (revision 69820) +++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.cpp (revision 69821) @@ -755,4 +755,7 @@ m_pLayoutBootOrder->setContentsMargins(3, 3, 3, 3); m_pLayoutBootOrder->setSpacing(3); +#else + const int iS = qApp->style()->pixelMetric(QStyle::PM_LayoutHorizontalSpacing) / 3; + m_pLayoutBootOrder->setSpacing(iS); #endif Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIFilmContainer.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIFilmContainer.cpp (revision 69820) +++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIFilmContainer.cpp (revision 69821) @@ -25,4 +25,5 @@ # include # include +# include # include # include @@ -68,5 +69,6 @@ /* Configure viewport layout: */ pWidgetLayout->setMargin(0); - pWidgetLayout->setSpacing(4); + const int iS = qApp->style()->pixelMetric(QStyle::PM_LayoutHorizontalSpacing) / 2; + pWidgetLayout->setSpacing(iS); /* Create new widgets according passed vector: */ for (int iScreenIndex = 0; iScreenIndex < value.size(); ++iScreenIndex) Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHostComboEditor.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHostComboEditor.cpp (revision 69820) +++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHostComboEditor.cpp (revision 69821) @@ -481,5 +481,6 @@ { /* Configure layout: */ - pLayout->setSpacing(4); + const int iS = qApp->style()->pixelMetric(QStyle::PM_LayoutVerticalSpacing) / 2; + pLayout->setSpacing(iS); pLayout->setContentsMargins(0, 0, 0, 0); /* Create UIHostComboEditorPrivate instance: */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHotKeyEditor.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHotKeyEditor.cpp (revision 69820) +++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHotKeyEditor.cpp (revision 69821) @@ -25,4 +25,5 @@ # include # include +# include /* GUI includes; */ @@ -123,5 +124,6 @@ /* Configure layout: */ - m_pMainLayout->setSpacing(4); + const int iS = qApp->style()->pixelMetric(QStyle::PM_LayoutVerticalSpacing) / 2; + m_pMainLayout->setSpacing(iS); m_pMainLayout->setContentsMargins(0, 0, 0, 0); m_pMainLayout->addWidget(m_pLineEdit); Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPortForwardingTable.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPortForwardingTable.cpp (revision 69820) +++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPortForwardingTable.cpp (revision 69821) @@ -826,6 +826,9 @@ /* On macOS we can do a bit of smoothness: */ pMainLayout->setContentsMargins(0, 0, 0, 0); + pMainLayout->setSpacing(3); +#else + const int iS = qApp->style()->pixelMetric(QStyle::PM_LayoutHorizontalSpacing) / 3; + pMainLayout->setSpacing(iS); #endif - pMainLayout->setSpacing(3); /* Create table: */ m_pTableView = new UIPortForwardingView; Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIWarningPane.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIWarningPane.cpp (revision 69820) +++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIWarningPane.cpp (revision 69821) @@ -107,5 +107,4 @@ /* Configure layout: */ pMainLayout->setContentsMargins(0, 0, 0, 0); - pMainLayout->setSpacing(10); /* Add left stretch: */ pMainLayout->addStretch(); @@ -121,5 +120,4 @@ /* Configure layout: */ m_pIconLayout->setContentsMargins(0, 0, 0, 0); - m_pIconLayout->setSpacing(6); /* Add into main-layout: */ pMainLayout->addLayout(m_pIconLayout);