Changeset 52402 in vbox

Timestamp:

Aug 18, 2014 6:38:06 PM (11 years ago)

Author:

vboxsync

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

95564

Message:

FE/Qt: Runtime UI: Sliding tool-bar: Top/bottom position support.

Location:

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

Files:

• UISlidingToolBar.cpp (modified) (4 diffs)
• UISlidingToolBar.h (modified) (2 diffs)
• UIStatusBarEditorWindow.cpp (modified) (4 diffs)

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

@@ -29 +29 @@
 #endif /* Q_WS_MAC */
 
-UISlidingToolBar::UISlidingToolBar(QWidget *pParentWidget, QWidget *pIndentWidget, QWidget *pChildWidget)
+UISlidingToolBar::UISlidingToolBar(QWidget *pParentWidget, QWidget *pIndentWidget, QWidget *pChildWidget, Position position)
     : QWidget(pParentWidget, Qt::Tool | Qt::FramelessWindowHint)
+    , m_position(position)
     , m_parentRect(pParentWidget->geometry())
     , m_indentRect(pIndentWidget->geometry())
@@ -128 +129 @@
 void UISlidingToolBar::prepareGeometry()
 {
-    /* Prepare geometry based on parent and mdi-sub-window size-hints: */
+    /* Prepare geometry based on parent and mdi-sub-window size-hints,
+     * But move mdi-sub-window to initial position: */
     const QSize sh = m_pEmbeddedWidget->sizeHint();
-    setGeometry(m_parentRect.x(), m_parentRect.y() + m_parentRect.height() - m_indentRect.height() - sh.height(),
-                qMax(m_parentRect.width(), sh.width()), sh.height());
-    /* But move mdi-sub-window to initial position: */
-    m_pEmbeddedWidget->setGeometry(0, sh.height(), qMax(width(), sh.width()), sh.height());
+    switch (m_position)
+    {
+        case Position_Top:
+        {
+            setGeometry(m_parentRect.x(), m_parentRect.y()                         + m_indentRect.height(),
+                        qMax(m_parentRect.width(), sh.width()), sh.height());
+            m_pEmbeddedWidget->setGeometry(0, -sh.height(), qMax(width(), sh.width()), sh.height());
+            break;
+        }
+        case Position_Bottom:
+        {
+            setGeometry(m_parentRect.x(), m_parentRect.y() + m_parentRect.height() - m_indentRect.height() - sh.height(),
+                        qMax(m_parentRect.width(), sh.width()), sh.height());
+            m_pEmbeddedWidget->setGeometry(0,  sh.height(), qMax(width(), sh.width()), sh.height());
+            break;
+        }
+    }
 
 #ifdef Q_WS_X11
@@ -171 +186 @@
     /* Adjust geometry based on parent and mdi-sub-window size-hints: */
     const QSize sh = m_pEmbeddedWidget->sizeHint();
-    setGeometry(m_parentRect.x(), m_parentRect.y() + m_parentRect.height() - m_indentRect.height() - sh.height(),
-                qMax(m_parentRect.width(), sh.width()), sh.height());
+    switch (m_position)
+    {
+        case Position_Top:
+        {
+            setGeometry(m_parentRect.x(), m_parentRect.y()                         + m_indentRect.height(),
+                        qMax(m_parentRect.width(), sh.width()), sh.height());
+            break;
+        }
+        case Position_Bottom:
+        {
+            setGeometry(m_parentRect.x(), m_parentRect.y() + m_parentRect.height() - m_indentRect.height() - sh.height(),
+                        qMax(m_parentRect.width(), sh.width()), sh.height());
+            break;
+        }
+    }
     /* And move mdi-sub-window to corresponding position: */
     m_pEmbeddedWidget->setGeometry(0, 0, qMax(width(), sh.width()), sh.height());
@@ -195 +223 @@
     /* Recalculate mdi-sub-window geometry animation boundaries based on size-hint: */
     const QSize sh = m_pEmbeddedWidget->sizeHint();
-    m_startWidgetGeometry = QRect(0, sh.height(), qMax(width(), sh.width()), sh.height());
-    m_finalWidgetGeometry = QRect(0,           0, qMax(width(), sh.width()), sh.height());
+    switch (m_position)
+    {
+        case Position_Top:    m_startWidgetGeometry = QRect(0, -sh.height(), qMax(width(), sh.width()), sh.height()); break;
+        case Position_Bottom: m_startWidgetGeometry = QRect(0,  sh.height(), qMax(width(), sh.width()), sh.height()); break;
+    }
+    m_finalWidgetGeometry = QRect(0, 0, qMax(width(), sh.width()), sh.height());
     m_pAnimation->update();
 }

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

@@ -47 +47 @@
 public:
 
+    /** Possible positions. */
+    enum Position
+    {
+        Position_Top,
+        Position_Bottom
+    };
+
     /** Constructor, passes @a pParentWidget to the QWidget constructor.
       * @param pParentWidget is used to get parent-widget geoemtry,
       * @param pIndentWidget is used to get indent-widget geometry,
       * @param pChildWidget  brings child-widget to be injected into tool-bar. */
-    UISlidingToolBar(QWidget *pParentWidget, QWidget *pIndentWidget, QWidget *pChildWidget);
+    UISlidingToolBar(QWidget *pParentWidget, QWidget *pIndentWidget, QWidget *pChildWidget, Position position);
 
 private slots:
@@ -98 +105 @@
     /** @name Geometry
       * @{ */
+        /** Holds the tool-bar position. */
+        const Position m_position;
         /** Holds the cached parent-widget geometry. */
         QRect m_parentRect;

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

@@ -118 +118 @@
 public:
 
-    /** Constructor, passes @a pParent to the QWidget constructor.
-      * @param rect is used to define initial cached parent geometry.
-      * @param statusBarRect is used to define initial cached status-bar geometry. */
+    /** Constructor, passes @a pParent to the QWidget constructor. */
     UIStatusBarEditorWidget(QWidget *pParent = 0);
 
@@ -445 +443 @@
     connect(gEDataManager, SIGNAL(sigStatusBarConfigurationChange()),
             this, SLOT(sltHandleConfigurationChange()));
+
     /* Update status buttons: */
     updateStatusButtons();
@@ -546 +545 @@
     }
 
+    /* Paint shape/shadow: */
+    painter.fillRect(QRect(5, 5, width() - 5 * 2, height() - 5), color0); // background
+    painter.fillRect(QRect(0,           0, 5, 5), grad1); // left corner
+    painter.fillRect(QRect(width() - 5, 0, 5, 5), grad2); // right corner
+    painter.fillRect(QRect(5, 0, width() - 5 * 2, 5), grad3); // bottom line
+    painter.fillRect(QRect(0,           5, 5, height() - 5), grad4); // left line
+    painter.fillRect(QRect(width() - 5, 5, 5, height() - 5), grad5); // right line
+
+#if defined(Q_WS_WIN) || defined(Q_WS_X11)
     /* Paint frames: */
-    painter.fillRect(QRect(5, 5, width() - 5 * 2, height() - 5), color0);
-    painter.fillRect(QRect(0, 0, 5, 5), grad1);
-    painter.fillRect(QRect(width() - 5, 0, 5, 5), grad2);
-    painter.fillRect(QRect(5, 0, width() - 5 * 2, 5), grad3);
-    painter.fillRect(QRect(0, 5, 5, height() - 5), grad4);
-    painter.fillRect(QRect(width() - 5, 5, 5, height() - 5), grad5);
-#if defined(Q_WS_WIN) || defined(Q_WS_X11)
     painter.save();
     painter.setPen(color3);
@@ -695 +696 @@
 
 UIStatusBarEditorWindow::UIStatusBarEditorWindow(UIMachineWindow *pParent)
-    : UISlidingToolBar(pParent, pParent->statusBar(), new UIStatusBarEditorWidget)
+    : UISlidingToolBar(pParent, pParent->statusBar(), new UIStatusBarEditorWidget, UISlidingToolBar::Position_Bottom)
 {
 }