Changeset 73799 in vbox

Timestamp:

Aug 21, 2018 9:22:39 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: UISlidingWidget: Add possibility to slide in vertical direction, not just in horizontal.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• manager/UIVirtualBoxManagerWidget.cpp (modified) (1 diff)
• selector/UISelectorWindow.cpp (modified) (1 diff)
• widgets/UISlidingWidget.cpp (modified) (4 diffs)
• widgets/UISlidingWidget.h (modified) (4 diffs)

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

@@ -468 +468 @@
 
                     /* Create sliding-widget: */
-                    m_pSlidingWidget = new UISlidingWidget;
+                    m_pSlidingWidget = new UISlidingWidget(Qt::Vertical);
                     if (m_pSlidingWidget)
                     {

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp

@@ -2047 +2047 @@
 
             /* Create sliding-widget: */
-            m_pSlidingWidget = new UISlidingWidget;
+            m_pSlidingWidget = new UISlidingWidget(Qt::Horizontal);
             AssertPtrReturnVoid(m_pSlidingWidget);
             {

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

@@ -19 +19 @@
 #include <QEvent>
 #include <QHBoxLayout>
+#include <QVBoxLayout>
 
 /* GUI includes: */
@@ -25 +26 @@
 
 
-UISlidingWidget::UISlidingWidget(QWidget *pParent /* = 0 */)
+UISlidingWidget::UISlidingWidget(Qt::Orientation enmOrientation, QWidget *pParent /* = 0 */)
     : QWidget(pParent)
+    , m_enmOrientation(enmOrientation)
     , m_enmState(State_Start)
     , m_pAnimation(0)
@@ -117 +119 @@
     {
         /* Create layout: */
-        m_pLayout = new QHBoxLayout(m_pWidget);
+        switch (m_enmOrientation)
+        {
+            case Qt::Horizontal: m_pLayout = new QHBoxLayout(m_pWidget); break;
+            case Qt::Vertical:   m_pLayout = new QVBoxLayout(m_pWidget); break;
+        }
         if (m_pLayout)
         {
@@ -135 +141 @@
 {
     /* Recalculate sub-window geometry animation boundaries based on size-hint: */
-    m_startWidgetGeometry = QRect(  0,           0,
-                                    2 * width(), height());
-    m_finalWidgetGeometry = QRect(- width(),     0,
-                                    2 * width(), height());
+    switch (m_enmOrientation)
+    {
+        case Qt::Horizontal:
+        {
+            m_startWidgetGeometry = QRect(  0,           0,
+                                            2 * width(), height());
+            m_finalWidgetGeometry = QRect(- width(),     0,
+                                            2 * width(), height());
+            break;
+        }
+        case Qt::Vertical:
+        {
+            m_startWidgetGeometry = QRect(0,       0,
+                                          width(), 2 * height());
+            m_finalWidgetGeometry = QRect(0,       -height(),
+                                          width(), 2 * height());
+            break;
+        }
+    }
 
     /* Update animation finally: */

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

@@ -23 +23 @@
 
 /* Forward declarations: */
-class QHBoxLayout;
+class QBoxLayout;
 class QRect;
 class QWidget;
@@ -56 +56 @@
     };
 
-    /** Constructs sliding widget passing @a pParent to the base-class. */
-    UISlidingWidget(QWidget *pParent = 0);
+    /** Constructs sliding widget passing @a pParent to the base-class.
+      * @param  enmOrientation  Brings the widget orientation. */
+    UISlidingWidget(Qt::Orientation enmOrientation, QWidget *pParent = 0);
 
     /** Holds the minimum widget size. */
@@ -105 +106 @@
     QRect finalWidgetGeometry() const { return m_finalWidgetGeometry; }
 
+    /** Holds the widget orientation. */
+    Qt::Orientation  m_enmOrientation;
+
     /** Holds whether we are in animation final state. */
     State        m_enmState;
@@ -117 +121 @@
     QWidget     *m_pWidget;
     /** Holds the widget layout instance. */
-    QHBoxLayout *m_pLayout;
+    QBoxLayout  *m_pLayout;
     /** Holds the 1st widget reference. */
     QWidget     *m_pWidget1;