Changeset 73637 in vbox

Timestamp:

Aug 13, 2018 1:53:13 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: VirtualBox Manager UI: A bunch of layout fixes.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager

Files:

• UIToolPaneGlobal.cpp (modified) (3 diffs)
• UIToolPaneMachine.cpp (modified) (3 diffs)
• UIToolbarTools.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIToolPaneGlobal.cpp

@@ -22 +22 @@
 /* Qt includes: */
 # include <QStackedLayout>
+# ifndef VBOX_WS_MAC
+#  include <QStyle>
+# endif
 # include <QUuid>
 
@@ -111 +114 @@
                 AssertPtrReturnVoid(m_pPaneMedia);
                 {
+#ifndef VBOX_WS_MAC
+                    const int iMargin = qApp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin) / 4;
+                    m_pPaneMedia->setContentsMargins(iMargin, 0, iMargin, 0);
+#endif
+
                     /* Configure pane: */
                     m_pPaneMedia->setProperty("ToolType", QVariant::fromValue(ToolTypeGlobal_VirtualMedia));
@@ -126 +134 @@
                 AssertPtrReturnVoid(m_pPaneNetwork);
                 {
+#ifndef VBOX_WS_MAC
+                    const int iMargin = qApp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin) / 4;
+                    m_pPaneNetwork->setContentsMargins(iMargin, 0, iMargin, 0);
+#endif
+
                     /* Configure pane: */
                     m_pPaneNetwork->setProperty("ToolType", QVariant::fromValue(ToolTypeGlobal_HostNetwork));

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIToolPaneMachine.cpp

@@ -22 +22 @@
 /* Qt includes: */
 # include <QStackedLayout>
+# ifndef VBOX_WS_MAC
+#  include <QStyle>
+# endif
 # include <QUuid>
 
@@ -134 +137 @@
                 AssertPtrReturnVoid(m_pPaneSnapshots);
                 {
+#ifndef VBOX_WS_MAC
+                    const int iMargin = qApp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin) / 4;
+                    m_pPaneSnapshots->setContentsMargins(iMargin, 0, iMargin, 0);
+#endif
+
                     /* Configure pane: */
                     m_pPaneSnapshots->setProperty("ToolType", QVariant::fromValue(ToolTypeMachine_Snapshots));
@@ -149 +157 @@
                 AssertPtrReturnVoid(m_pPaneLogViewer);
                 {
+#ifndef VBOX_WS_MAC
+                    const int iMargin = qApp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin) / 4;
+                    m_pPaneLogViewer->setContentsMargins(iMargin, 0, iMargin, 0);
+#endif
+
                     /* Configure pane: */
                     m_pPaneLogViewer->setProperty("ToolType", QVariant::fromValue(ToolTypeMachine_LogViewer));

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIToolbarTools.cpp

@@ -256 +256 @@
     {
         /* Configure layout: */
-        m_pLayoutMain->setContentsMargins(0, 0, 0, 0);
+#ifndef VBOX_WS_MAC
+        const int iL = qApp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin) / 9;
+        m_pLayoutMain->setContentsMargins(iL, 0, 0, 0);
+#endif
 
         /* Create Machine tab-bar: */