Changeset 77224 in vbox for trunk/src/VBox

Timestamp:

Feb 8, 2019 3:38:03 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9241: VirtualBox Manager UI: Now, that one is heavy: Moving Chooser-pane scrolling logic from QGraphicsView to own UIGraphicsScrollArea making it potentially possible to scroll any group we have separately.

Location:

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

Files:

• UIChooser.cpp (modified) (1 diff)
• UIChooserItem.cpp (modified) (3 diffs)
• UIChooserItem.h (modified) (3 diffs)
• UIChooserItemGroup.cpp (modified) (12 diffs)
• UIChooserItemGroup.h (modified) (3 diffs)
• UIChooserModel.cpp (modified) (2 diffs)
• UIChooserModel.h (modified) (1 diff)
• UIChooserView.cpp (modified) (4 diffs)
• UIChooserView.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooser.cpp

@@ -167 +167 @@
     connect(m_pChooserModel, &UIChooserModel::sigRootItemMinimumWidthHintChanged,
             m_pChooserView, &UIChooserView::sltMinimumWidthHintChanged);
-    connect(m_pChooserModel, &UIChooserModel::sigRootItemMinimumHeightHintChanged,
-            m_pChooserView, &UIChooserView::sltMinimumHeightHintChanged);
     connect(m_pChooserModel, &UIChooserModel::sigFocusChanged,
             m_pChooserView, &UIChooserView::sltFocusChanged);

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItem.cpp

@@ -209 +209 @@
     , m_iAnimatedValue(m_iDefaultValue)
     , m_iPreviousMinimumWidthHint(0)
-    , m_iPreviousMinimumHeightHint(0)
     , m_enmDragTokenPlace(DragToken_Off)
     , m_iDragTokenDarkness(110)
@@ -391 +390 @@
             emit sigMinimumWidthHintChanged(m_iPreviousMinimumWidthHint);
         }
-        /* Root-item should notify chooser-view if minimum-height-hint was changed: */
-        const int iMinimumHeightHint = minimumHeightHint();
-        if (m_iPreviousMinimumHeightHint != iMinimumHeightHint)
-        {
-            /* Save new minimum-height-hint, notify listener: */
-            m_iPreviousMinimumHeightHint = iMinimumHeightHint;
-            emit sigMinimumHeightHintChanged(m_iPreviousMinimumHeightHint);
-        }
     }
 }
@@ -538 +529 @@
     /* Reset minimum size hints for non-root items: */
     if (!isRoot())
-    {
         m_iPreviousMinimumWidthHint = 0;
-        m_iPreviousMinimumHeightHint = 0;
-    }
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItem.h

@@ -98 +98 @@
         /** Notifies listeners about @a iMinimumWidthHint change. */
         void sigMinimumWidthHintChanged(int iMinimumWidthHint);
-        /** Notifies listeners about @a iMinimumHeightHint change. */
-        void sigMinimumHeightHintChanged(int iMinimumHeightHint);
     /** @} */
 
@@ -159 +157 @@
         /** Returns whether item is hovered. */
         bool isHovered() const;
+
+        /** Installs event-filter for @a pSource object.
+          * @note  Base-class implementation does nothing. */
+        virtual void installEventFilterHelper(QObject *pSource) { Q_UNUSED(pSource); }
     /** @} */
 
@@ -358 +360 @@
         /** Holds previous minimum width hint. */
         int  m_iPreviousMinimumWidthHint;
-        /** Holds previous minimum height hint. */
-        int  m_iPreviousMinimumHeightHint;
     /** @} */
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGroup.cpp

@@ -35 +35 @@
 #include "UIChooserView.h"
 #include "UIGraphicsRotatorButton.h"
+#include "UIGraphicsScrollArea.h"
 #include "UIIconPool.h"
 #include "UIVirtualBoxManager.h"
@@ -53 +54 @@
     , m_pExitButton(0)
     , m_pNameEditorWidget(0)
+    , m_pScrollArea(0)
     , m_pContainer(0)
     , m_pLayout(0)
@@ -72 +74 @@
     connect(this, &UIChooserItemGroup::sigMinimumWidthHintChanged,
             model(), &UIChooserModel::sigRootItemMinimumWidthHintChanged);
-    connect(this, &UIChooserItemGroup::sigMinimumHeightHintChanged,
-            model(), &UIChooserModel::sigRootItemMinimumHeightHintChanged);
 }
 
@@ -89 +89 @@
     , m_pExitButton(0)
     , m_pNameEditorWidget(0)
+    , m_pScrollArea(0)
     , m_pContainer(0)
     , m_pLayout(0)
@@ -128 +129 @@
     , m_pExitButton(0)
     , m_pNameEditorWidget(0)
+    , m_pScrollArea(0)
     , m_pContainer(0)
     , m_pLayout(0)
@@ -160 +162 @@
     connect(this, &UIChooserItemGroup::sigMinimumWidthHintChanged,
             model(), &UIChooserModel::sigRootItemMinimumWidthHintChanged);
-    connect(this, &UIChooserItemGroup::sigMinimumHeightHintChanged,
-            model(), &UIChooserModel::sigRootItemMinimumHeightHintChanged);
 }
 
@@ -177 +177 @@
     , m_pExitButton(0)
     , m_pNameEditorWidget(0)
+    , m_pScrollArea(0)
     , m_pContainer(0)
     , m_pLayout(0)
@@ -276 +277 @@
 {
     return !m_fClosed || isRoot();
+}
+
+void UIChooserItemGroup::installEventFilterHelper(QObject *pSource)
+{
+    /* The only object which need's that filter for now is scroll-area: */
+    pSource->installEventFilter(m_pScrollArea);
 }
 
@@ -792 +799 @@
     if (isRoot())
     {
+        /* Acquire view: */
+        const QGraphicsView *pView = model()->scene()->views().first();
+
         /* Header (non-main root-item): */
         if (!isMainRoot())
@@ -818 +828 @@
             iPreviousVerticalIndent = iVerticalMargin + iFullHeaderHeight + iVerticalMargin;
         }
+
+        /* Adjust scroll-view geometry: */
+        QSize viewSize = pView->size();
+        viewSize.setHeight(viewSize.height() - iPreviousVerticalIndent);
+        m_pScrollArea->resize(viewSize);
+        m_pScrollArea->setPos(0, iPreviousVerticalIndent);
     }
     /* Header (non-root-item): */
@@ -856 +872 @@
         /* Prepare body indent: */
         iPreviousVerticalIndent = 2 * iVerticalMargin + iFullHeaderHeight;
-    }
-
-    /* Adjust container geometry: */
-    QSize itemSize = size().toSize();
-    itemSize.setHeight(minimumHeightHint() - iPreviousVerticalIndent);
-    m_pContainer->resize(itemSize);
-    m_pContainer->setPos(0, iPreviousVerticalIndent);
+
+        /* Adjust scroll-view geometry: */
+        QSize itemSize = size().toSize();
+        itemSize.setHeight(itemSize.height() - iPreviousVerticalIndent);
+        m_pScrollArea->resize(itemSize);
+        m_pScrollArea->setPos(0, iPreviousVerticalIndent);
+    }
 
     /* No body for closed group: */
     if (isClosed())
-        m_pContainer->hide();
+        m_pScrollArea->hide();
     /* Body for opened group: */
     else
     {
-        m_pContainer->show();
+        m_pScrollArea->show();
         foreach (UIChooserItem *pItem, items())
             pItem->updateLayout();
@@ -1257 +1273 @@
     m_exitButtonSize = m_pExitButton ? m_pExitButton->minimumSizeHint().toSize() : QSize(0, 0);
 
-    /* Prepare container: */
-    m_pContainer = new QIGraphicsWidget(this);
-    if (m_pContainer)
-    {
-        /* Prepare layout: */
-        m_pLayout = new QGraphicsLinearLayout(Qt::Vertical, m_pContainer);
-        if (m_pLayout)
-        {
-            m_pLayout->setContentsMargins(0, 0, 0, 0);
-            m_pLayout->setSpacing(0);
-
-            /* Prepare global layout: */
-            m_pLayoutGlobal = new QGraphicsLinearLayout(Qt::Vertical);
-            if (m_pLayoutGlobal)
+    /* Prepare scroll-area: */
+    m_pScrollArea = new UIGraphicsScrollArea(Qt::Vertical, this);
+    if (m_pScrollArea)
+    {
+        /* Prepare container: */
+        m_pContainer = new QIGraphicsWidget;
+        if (m_pContainer)
+        {
+            /* Prepare layout: */
+            m_pLayout = new QGraphicsLinearLayout(Qt::Vertical, m_pContainer);
+            if (m_pLayout)
             {
-                m_pLayoutGlobal->setContentsMargins(0, 0, 0, 0);
-                m_pLayoutGlobal->setSpacing(1);
-                m_pLayout->addItem(m_pLayoutGlobal);
+                m_pLayout->setContentsMargins(0, 0, 0, 0);
+                m_pLayout->setSpacing(0);
+
+                /* Prepare global layout: */
+                m_pLayoutGlobal = new QGraphicsLinearLayout(Qt::Vertical);
+                if (m_pLayoutGlobal)
+                {
+                    m_pLayoutGlobal->setContentsMargins(0, 0, 0, 0);
+                    m_pLayoutGlobal->setSpacing(1);
+                    m_pLayout->addItem(m_pLayoutGlobal);
+                }
+
+                /* Prepare group layout: */
+                m_pLayoutGroup = new QGraphicsLinearLayout(Qt::Vertical);
+                if (m_pLayoutGroup)
+                {
+                    m_pLayoutGroup->setContentsMargins(0, 0, 0, 0);
+                    m_pLayoutGroup->setSpacing(1);
+                    m_pLayout->addItem(m_pLayoutGroup);
+                }
+
+                /* Prepare machine layout: */
+                m_pLayoutMachine = new QGraphicsLinearLayout(Qt::Vertical);
+                if (m_pLayoutMachine)
+                {
+                    m_pLayoutMachine->setContentsMargins(0, 0, 0, 0);
+                    m_pLayoutMachine->setSpacing(1);
+                    m_pLayout->addItem(m_pLayoutMachine);
+                }
             }
 
-            /* Prepare group layout: */
-            m_pLayoutGroup = new QGraphicsLinearLayout(Qt::Vertical);
-            if (m_pLayoutGroup)
-            {
-                m_pLayoutGroup->setContentsMargins(0, 0, 0, 0);
-                m_pLayoutGroup->setSpacing(1);
-                m_pLayout->addItem(m_pLayoutGroup);
-            }
-
-            /* Prepare machine layout: */
-            m_pLayoutMachine = new QGraphicsLinearLayout(Qt::Vertical);
-            if (m_pLayoutMachine)
-            {
-                m_pLayoutMachine->setContentsMargins(0, 0, 0, 0);
-                m_pLayoutMachine->setSpacing(1);
-                m_pLayout->addItem(m_pLayoutMachine);
-            }
+            /* Assign to scroll-area: */
+            m_pScrollArea->setViewport(m_pContainer);
         }
     }

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGroup.h

@@ -41 +41 @@
 class UIGraphicsButton;
 class UIGraphicsRotatorButton;
+class UIGraphicsScrollArea;
 
 
@@ -89 +90 @@
         /** Returns whether group is opened. */
         bool isOpened() const;
+
+        /** Installs event-filter for @a pSource object. */
+        virtual void installEventFilterHelper(QObject *pSource) /* override */;
     /** @} */
 
@@ -355 +359 @@
     /** @name Children stuff.
       * @{ */
+        /** Holds the children scroll-area instance. */
+        UIGraphicsScrollArea  *m_pScrollArea;
         /** Holds the children container instance. */
-        QIGraphicsWidget *m_pContainer;
+        QIGraphicsWidget      *m_pContainer;
 
         /** Holds the main layout instance. */

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.cpp

@@ -92 +92 @@
 void UIChooserModel::init()
 {
+    /* Install root as event-filter for scene view,
+     * we need QEvent::Scroll events from it: */
+    root()->installEventFilterHelper(scene()->views()[0]);
+
     /* Load group tree: */
     loadGroupTree();
@@ -668 +672 @@
     /* Initialize variables: */
     const int iSceneMargin = data(ChooserModelData_Margin).toInt();
-    const QSize viewportSize = scene()->views()[0]->viewport()->size();
+    const QSize viewportSize = scene()->views()[0]->size();
     const int iViewportWidth = viewportSize.width() - 2 * iSceneMargin;
     const int iViewportHeight = viewportSize.height() - 2 * iSceneMargin;

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.h

@@ -95 +95 @@
         /** Notifies about root item minimum width @a iHint changed. */
         void sigRootItemMinimumWidthHintChanged(int iHint);
-        /** Notifies about root item minimum height @a iHint changed. */
-        void sigRootItemMinimumHeightHintChanged(int iHint);
     /** @} */
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserView.cpp

@@ -95 +95 @@
     , m_pChooser(pParent)
     , m_iMinimumWidthHint(0)
-    , m_iMinimumHeightHint(0)
 {
     /* Prepare: */
@@ -132 +131 @@
 }
 
-void UIChooserView::sltMinimumHeightHintChanged(int iHint)
-{
-    /* Is there something changed? */
-    if (m_iMinimumHeightHint == iHint)
-        return;
-
-    /* Remember new value: */
-    m_iMinimumHeightHint = iHint;
-
-    /* Update scene-rect: */
-    updateSceneRect();
-}
-
 void UIChooserView::retranslateUi()
 {
@@ -168 +154 @@
     /* Setup scroll-bars policy: */
     setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
 
     /* Update scene-rect: */
@@ -191 +178 @@
     /* Notify listeners: */
     emit sigResized();
+
+    /* Update scene-rect: */
+    updateSceneRect();
 }
 
 void UIChooserView::updateSceneRect()
 {
-    setSceneRect(0, 0, m_iMinimumWidthHint, m_iMinimumHeightHint);
+    setSceneRect(0, 0, m_iMinimumWidthHint, height());
 }

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserView.h

@@ -63 +63 @@
         /** Handles minimum width @a iHint change. */
         void sltMinimumWidthHintChanged(int iHint);
-        /** Handles minimum height @a iHint change. */
-        void sltMinimumHeightHintChanged(int iHint);
     /** @} */
 
@@ -104 +102 @@
         /** Holds the minimum width hint. */
         int m_iMinimumWidthHint;
-        /** Holds the minimum height hint. */
-        int m_iMinimumHeightHint;
     /** @} */
 };