Changeset 47041 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jul 8, 2013 1:59:23 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: Popup-center: Popup-stack layout now takes into account *parent-window* menu-bar and status-bar if necessary.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/widgets

Files:

• UIPopupStack.cpp (modified) (7 diffs)
• UIPopupStack.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupStack.cpp

@@ -21 +21 @@
 #include <QEvent>
 #include <QMainWindow>
+#include <QMenuBar>
 #include <QStatusBar>
 
@@ -34 +35 @@
     : m_iLayoutMargin(1)
     , m_iLayoutSpacing(1)
+    , m_iParentMenuBarHeight(0)
     , m_iParentStatusBarHeight(0)
 {
@@ -115 +117 @@
     /* Call to base-class: */
     QWidget::setParent(pParent);
+    /* Recalculate parent menu-bar height: */
+    m_iParentMenuBarHeight = parentMenuBarHeight(pParent);
     /* Recalculate parent status-bar height: */
     m_iParentStatusBarHeight = parentStatusBarHeight(pParent);
@@ -123 +127 @@
     /* Call to base-class: */
     QWidget::setParent(pParent, flags);
+    /* Recalculate parent menu-bar height: */
+    m_iParentMenuBarHeight = parentMenuBarHeight(pParent);
     /* Recalculate parent status-bar height: */
     m_iParentStatusBarHeight = parentStatusBarHeight(pParent);
@@ -139 +145 @@
     bool fIsWindow = isWindow();
     const int iX = fIsWindow ? parentWidget()->x() : 0;
-    const int iY = fIsWindow ? parentWidget()->y() : 0;
+    const int iY = fIsWindow ? parentWidget()->y() : m_iParentMenuBarHeight;
     const int iWidth = parentWidget()->width();
     const int iHeight = m_minimumSizeHint.height();
@@ -282 +288 @@
 
 /* static */
+int UIPopupStack::parentMenuBarHeight(QWidget *pParent)
+{
+    /* Menu-bar can exist only on QMainWindow sub-class: */
+    if (QMainWindow *pMainWindow = qobject_cast<QMainWindow*>(pParent))
+    {
+        /* Search for existing menu-bar child: */
+        if (QMenuBar *pMenuBar = pMainWindow->findChild<QMenuBar*>())
+            return pMenuBar->height();
+    }
+    /* Zero by default: */
+    return 0;
+}
+
+/* static */
 int UIPopupStack::parentStatusBarHeight(QWidget *pParent)
 {
@@ -287 +307 @@
     if (QMainWindow *pMainWindow = qobject_cast<QMainWindow*>(pParent))
     {
-        /* Status-bar can exist only:
-         * 1. on non-machine-window
-         * 2. on machine-window in normal mode: */
-        if (!qobject_cast<UIMachineWindow*>(pMainWindow) ||
-            qobject_cast<UIMachineWindowNormal*>(pMainWindow))
-            return pMainWindow->statusBar()->height();
+        /* Search for existing status-bar child: */
+        if (QStatusBar *pStatusBar = pMainWindow->findChild<QStatusBar*>())
+            return pStatusBar->height();
     }
     /* Zero by default: */

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupStack.h

@@ -81 +81 @@
 
     /* Static helpers: Prepare stuff: */
+    static int parentMenuBarHeight(QWidget *pParent);
     static int parentStatusBarHeight(QWidget *pParent);
 
@@ -87 +88 @@
     const int m_iLayoutSpacing;
     QSize m_minimumSizeHint;
+    int m_iParentMenuBarHeight;
     int m_iParentStatusBarHeight;
     QMap<QString, UIPopupPane*> m_panes;