Changeset 79842 in vbox

Timestamp:

Jul 17, 2019 4:51:51 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9241: VirtualBox Manager: Details pane: Rework Details group to use own UIGraphicsScrollArea instead of common scrolling facility of UIDetailsView.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager/details

Files:

• UIDetails.cpp (modified) (2 diffs)
• UIDetailsGroup.cpp (modified) (6 diffs)
• UIDetailsGroup.h (modified) (5 diffs)
• UIDetailsItem.h (modified) (1 diff)
• UIDetailsModel.cpp (modified) (1 diff)
• UIDetailsModel.h (modified) (2 diffs)
• UIDetailsView.cpp (modified) (4 diffs)
• UIDetailsView.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetails.cpp

@@ -65 +65 @@
                 pMainLayout->addWidget(m_pDetailsView);
             }
+
+            /* Init model: */
+            m_pDetailsModel->init();
         }
     }
@@ -77 +80 @@
     connect(m_pDetailsModel, &UIDetailsModel::sigRootItemMinimumWidthHintChanged,
             m_pDetailsView, &UIDetailsView::sltMinimumWidthHintChanged);
-    connect(m_pDetailsModel, &UIDetailsModel::sigRootItemMinimumHeightHintChanged,
-            m_pDetailsView, &UIDetailsView::sltMinimumHeightHintChanged);
     connect(m_pDetailsModel, &UIDetailsModel::sigLinkClicked,
             this, &UIDetails::sigLinkClicked);

trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsGroup.cpp

@@ -24 +24 @@
 
 /* GUI includes: */
+#include "UIGraphicsScrollArea.h"
 #include "UIDetailsGroup.h"
 #include "UIDetailsModel.h"
@@ -36 +37 @@
     : UIDetailsItem(0)
     , m_pBuildStep(0)
+    , m_pScrollArea(0)
     , m_pContainer(0)
     , m_pLayout(0)
     , m_iPreviousMinimumWidthHint(0)
-    , m_iPreviousMinimumHeightHint(0)
-{
-    /* Prepare container: */
-    m_pContainer = new QIGraphicsWidget(this);
-    if (m_pContainer)
-    {
-        /* Prepare layout: */
-        m_pLayout = new QGraphicsLinearLayout(Qt::Vertical, m_pContainer);
-        if (m_pLayout)
+{
+    /* Prepare scroll-area: */
+    m_pScrollArea = new UIGraphicsScrollArea(Qt::Vertical, this);
+    if (m_pScrollArea)
+    {
+        /* Prepare container: */
+        m_pContainer = new QIGraphicsWidget;
+        if (m_pContainer)
         {
-            m_pLayout->setContentsMargins(0, 0, 0, 0);
-            m_pLayout->setSpacing(0);
+            /* Prepare layout: */
+            m_pLayout = new QGraphicsLinearLayout(Qt::Vertical, m_pContainer);
+            if (m_pLayout)
+            {
+                m_pLayout->setContentsMargins(0, 0, 0, 0);
+                m_pLayout->setSpacing(0);
+            }
+
+            /* Assign to scroll-area: */
+            m_pScrollArea->setViewport(m_pContainer);
         }
     }
@@ -102 +111 @@
 }
 
+void UIDetailsGroup::installEventFilterHelper(QObject *pSource)
+{
+    /* The only object which need's that filter for now is scroll-area: */
+    pSource->installEventFilter(m_pScrollArea);
+}
+
 QList<UIDetailsItem*> UIDetailsGroup::items(UIDetailsItemType enmType /* = UIDetailsItemType_Set */) const
 {
@@ -118 +133 @@
     UIDetailsView *pView = model()->view();
 
-    /* Adjust children container geometry: */
-    m_pContainer->resize(pView->viewport()->size());
-    m_pContainer->setPos(0, 0);
+    /* Adjust children scroll-area: */
+    m_pScrollArea->resize(pView->size());
+    m_pScrollArea->setPos(0, 0);
 
     /* Layout all the sets: */
@@ -242 +257 @@
         emit sigMinimumWidthHintChanged(m_iPreviousMinimumWidthHint);
     }
-    /* Group-item should notify details-view if minimum-height-hint was changed: */
-    int iMinimumHeightHint = minimumHeightHint();
-    if (m_iPreviousMinimumHeightHint != iMinimumHeightHint)
-    {
-        /* Save new minimum-height-hint, notify listener: */
-        m_iPreviousMinimumHeightHint = iMinimumHeightHint;
-        emit sigMinimumHeightHintChanged(m_iPreviousMinimumHeightHint);
-    }
 }
 
@@ -257 +264 @@
     connect(this, SIGNAL(sigMinimumWidthHintChanged(int)),
             model(), SIGNAL(sigRootItemMinimumWidthHintChanged(int)));
-    connect(this, SIGNAL(sigMinimumHeightHintChanged(int)),
-            model(), SIGNAL(sigRootItemMinimumHeightHintChanged(int)));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsGroup.h

@@ -28 +28 @@
 class QGraphicsLinearLayout;
 class QGraphicsScene;
+class UIGraphicsScrollArea;
 class UIVirtualMachineItem;
 
@@ -41 +42 @@
         /** Notifies listeners about @a iMinimumWidthHint changed. */
         void sigMinimumWidthHintChanged(int iMinimumWidthHint);
-        /** Notifies listeners about @a iMinimumHeightHint changed. */
-        void sigMinimumHeightHintChanged(int iMinimumHeightHint);
     /** @} */
 
@@ -63 +62 @@
         /** Stops currently building group. */
         void stopBuildingGroup();
+
+        /** Installs event-filter for @a pSource object. */
+        virtual void installEventFilterHelper(QObject *pSource) /* override */;
     /** @} */
 
@@ -152 +154 @@
     /** @name Children stuff.
       * @{ */
+        /** Holds the children scroll-area instance. */
+        UIGraphicsScrollArea  *m_pScrollArea;
         /** Holds the children container instance. */
         QIGraphicsWidget      *m_pContainer;
@@ -166 +170 @@
     /** @name Layout stuff.
       * @{ */
+        /** Holds previous minimum width hint. */
         int m_iPreviousMinimumWidthHint;
-        int m_iPreviousMinimumHeightHint;
     /** @} */
 };

trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsItem.h

@@ -89 +89 @@
         /** Returns the description of the item. */
         virtual QString description() const = 0;
+
+        /** Installs event-filter for @a pSource object.
+          * @note  Base-class implementation does nothing. */
+        virtual void installEventFilterHelper(QObject *pSource) { Q_UNUSED(pSource); }
     /** @} */
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsModel.cpp

@@ -56 +56 @@
 }
 
+void UIDetailsModel::init()
+{
+    /* Install root as event-filter for scene view,
+     * we need QEvent::Scroll events from it: */
+    root()->installEventFilterHelper(view());
+}
+
 QGraphicsScene *UIDetailsModel::scene() const
 {

trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsModel.h

@@ -58 +58 @@
     /** Notifies listeners about model root item @a iMinimumWidthHint changed. */
     void sigRootItemMinimumWidthHintChanged(int iMinimumWidthHint);
-    /** Notifies listeners about model root item @a iMinimumHeightHint changed. */
-    void sigRootItemMinimumHeightHintChanged(int iMinimumHeightHint);
 
     /** Notifies listeners about element link clicked.
@@ -74 +72 @@
     /** Destructs a details model. */
     virtual ~UIDetailsModel() /* override */;
+
+    /** Inits model. */
+    void init();
 
     /** Returns graphics scene this model belongs to. */

trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsView.cpp

@@ -110 +110 @@
     , m_pDetails(pParent)
     , m_iMinimumWidthHint(0)
-    , m_iMinimumHeightHint(0)
 {
     /* Install Details-view accessibility interface factory: */
@@ -122 +121 @@
     /* Setup scroll-bars policy: */
     setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
 
     /* Update scene-rect: */
@@ -148 +148 @@
 }
 
-void UIDetailsView::sltMinimumHeightHintChanged(int iMinimumHeightHint)
-{
-    /* Is there something changed? */
-    if (m_iMinimumHeightHint == iMinimumHeightHint)
-        return;
-
-    /* Remember new value: */
-    m_iMinimumHeightHint = iMinimumHeightHint;
-    if (m_iMinimumHeightHint <= 0)
-        m_iMinimumHeightHint = 1;
-
-    /* Update scene-rect: */
-    updateSceneRect();
-}
-
 void UIDetailsView::retranslateUi()
 {
@@ -177 +162 @@
     /* Notify listeners: */
     emit sigResized();
+
+    /* Update scene-rect: */
+    updateSceneRect();
 }
 
 void UIDetailsView::updateSceneRect()
 {
-    setSceneRect(0, 0, m_iMinimumWidthHint, m_iMinimumHeightHint);
+    setSceneRect(0, 0, m_iMinimumWidthHint, height());
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsView.h

@@ -52 +52 @@
     /* Handlers: Size-hint stuff: */
     void sltMinimumWidthHintChanged(int iMinimumWidthHint);
-    void sltMinimumHeightHintChanged(int iMinimumHeightHint);
 
 private:
@@ -70 +69 @@
     /* Variables: */
     int m_iMinimumWidthHint;
-    int m_iMinimumHeightHint;
 };