Changeset 52480 in vbox

Timestamp:

Aug 22, 2014 3:53:41 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

95697

Message:

FE/Qt: Mac OS X: For for r95695: No menu-bar indent under this OS.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMenuBarEditorWindow.cpp (modified) (1 diff)
• UISlidingToolBar.cpp (modified) (1 diff)

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

@@ -825 +825 @@
 
 UIMenuBarEditorWindow::UIMenuBarEditorWindow(UIMachineWindow *pParent, UIActionPool *pActionPool)
+#ifndef Q_WS_MAC
     : UISlidingToolBar(pParent, pParent->menuBar(), new UIMenuBarEditorWidget(pActionPool), UISlidingToolBar::Position_Top)
+#else /* Q_WS_MAC */
+    : UISlidingToolBar(pParent, 0, new UIMenuBarEditorWidget(pActionPool), UISlidingToolBar::Position_Top)
+#endif /* Q_WS_MAC */
 {
 }

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

@@ -32 +32 @@
     : QWidget(pParentWidget, Qt::Tool | Qt::FramelessWindowHint)
     , m_position(position)
-    , m_parentRect(pParentWidget->geometry())
-    , m_indentRect(pIndentWidget->geometry())
+    , m_parentRect(pParentWidget ? pParentWidget->geometry() : QRect())
+    , m_indentRect(pIndentWidget ? pIndentWidget->geometry() : QRect())
     , m_pAnimation(0)
     , m_fExpanded(false)