Changeset 83490 in vbox

Timestamp:

Mar 30, 2020 4:57:41 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9686. Hopefully somewhat better table width handling.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/monitor/resource/UIResourceMonitor.cpp (modified) (12 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/monitor/resource/UIResourceMonitor.cpp

@@ -73 +73 @@
 
     UIVMResouceMonitorTableView(QWidget *pParent = 0);
+    void setMinimumColumnWidths(const QVector<int>& widths);
+    void updateColumVisibility();
 
 protected:
@@ -80 +82 @@
 private slots:
 
-    void sltHeaderResized(int iIndex, int iOldSize, int iNewSize);
+
 
 private:
 
     void resizeHeader();
-    QSet<int> m_userResizedColums;
-
+    QVector<int> m_minimumColumnWidths;
 };
 
@@ -146 +147 @@
 
 private:
+
     QVariant m_data;
 };
@@ -166 +168 @@
 
     //virtual bool lessThan(const QModelIndex &left, const QModelIndex &right) const /* override */;
-    virtual bool filterAcceptsColumn(int source_column, const QModelIndex &source_parent) const /* override */;
+    /** Section (column) visibility is controlled by the QHeaderView (see UIVMResouceMonitorTableView::updateColumVisibility)
+     *  to have somewhat meaningful column resizing. */
+    //virtual bool filterAcceptsColumn(int source_column, const QModelIndex &source_parent) const /* override */;
 
 private:
@@ -239 +243 @@
 
 
+
 /*********************************************************************************************************************************
 *   Class UIVMResouceMonitorTableView implementation.                                                                            *
@@ -245 +250 @@
 UIVMResouceMonitorTableView::UIVMResouceMonitorTableView(QWidget *pParent /* = 0 */)
     :QTableView(pParent)
-{
-    QHeaderView* pHeader = horizontalHeader();
-    if (pHeader)
-    {
-        connect(pHeader, &QHeaderView::sectionResized, this, &UIVMResouceMonitorTableView::sltHeaderResized);
-        //pHeader->setResizeMode(QHeaderView::ResizeToContents);
-    }
+    , m_minimumColumnWidths(QVector<int>((int)VMResouceMonitorColumn_Max, 0))
+{
+}
+
+void UIVMResouceMonitorTableView::setMinimumColumnWidths(const QVector<int>& widths)
+{
+    m_minimumColumnWidths = widths;
+}
+
+void UIVMResouceMonitorTableView::updateColumVisibility()
+{
+    UIResourceMonitorProxyModel *pProxyModel = qobject_cast<UIResourceMonitorProxyModel *>(model());
+    if (!pProxyModel)
+        return;
+    UIResourceMonitorModel *pModel = qobject_cast<UIResourceMonitorModel *>(pProxyModel->sourceModel());
+    QHeaderView *pHeader = horizontalHeader();
+
+    if (!pModel || !pHeader)
+        return;
+    for (int i = (int)VMResouceMonitorColumn_Name; i < (int)VMResouceMonitorColumn_Max; ++i)
+    {
+        if (!pModel->columnVisible(i))
+            pHeader->hideSection(i);
+        else
+            pHeader->showSection(i);
+    }
+    resizeHeader();
 }
 
 void UIVMResouceMonitorTableView::resizeEvent(QResizeEvent *pEvent)
 {
-    //resizeHeader();
+    resizeHeader();
     QTableView::resizeEvent(pEvent);
 }
@@ -266 +291 @@
         return;
     int iSectionCount = pHeader->count();
-    if (iSectionCount <= 0)
-        return;
-    pHeader->setDefaultSectionSize(width() / iSectionCount);
-}
-
-void UIVMResouceMonitorTableView::sltHeaderResized(int iIndex, int iOldSize, int iNewSize)
-{
-    printf("section resize %d %d %d\n", iIndex, iOldSize, iNewSize);
+    int iHiddenSectionCount = pHeader->hiddenSectionCount();
+    int iWidth = width() / (iSectionCount - iHiddenSectionCount);
+    for (int i = 0; i < iSectionCount && i < m_minimumColumnWidths.size(); ++i)
+    {
+        if (pHeader->isSectionHidden(i))
+            continue;
+        pHeader->resizeSection(i, iWidth < m_minimumColumnWidths[i] ? m_minimumColumnWidths[i] : iWidth);
+    }
 }
 
@@ -408 +433 @@
 }
 
-
-bool UIResourceMonitorProxyModel::filterAcceptsColumn(int iSourceColumn, const QModelIndex &sourceParent) const
-{
-    Q_UNUSED(sourceParent);
-    UIResourceMonitorModel* pModel = qobject_cast<UIResourceMonitorModel*>(sourceModel());
-    if (!pModel)
-        return true;
-    return pModel->columnVisible(iSourceColumn);
-}
+/* See the function definition comment: */
+// bool UIResourceMonitorProxyModel::filterAcceptsColumn(int iSourceColumn, const QModelIndex &sourceParent) const
+// {
+//     Q_UNUSED(sourceParent);
+//     UIResourceMonitorModel* pModel = qobject_cast<UIResourceMonitorModel*>(sourceModel());
+//     if (!pModel)
+//         return true;
+//     return pModel->columnVisible(iSourceColumn);
+// }
 
 
@@ -783 +808 @@
     if (m_pModel)
         m_pModel->setColumnCaptions(m_columnCaptions);
+    if (m_pTableView)
+    {
+        QFontMetrics fontMetrics(m_pTableView->font());
+        QVector<int> columnWidths;
+        foreach (const QString strCaption, m_columnCaptions)
+        {
+            columnWidths << fontMetrics.width(strCaption) +
+                QApplication::style()->pixelMetric(QStyle::PM_LayoutLeftMargin) +
+                QApplication::style()->pixelMetric(QStyle::PM_LayoutRightMargin);
+        }
+        m_pTableView->setMinimumColumnWidths(columnWidths);
+    }
 }
 
@@ -846 +883 @@
         m_pTableView->setShowGrid(false);
         m_pTableView->horizontalHeader()->setHighlightSections(false);
-        //m_pTableView->horizontalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents);
-        //m_pTableView->horizontalHeader()->setStretchLastSection(true);
-
+        m_pTableView->horizontalHeader()->setSectionResizeMode(QHeaderView::Fixed);
         m_pTableView->verticalHeader()->setVisible(false);
         m_pTableView->setEditTriggers(QAbstractItemView::NoEditTriggers);
@@ -858 +893 @@
         connect(m_pModel, &UIResourceMonitorModel::sigDataUpdate, this, &UIResourceMonitorWidget::sltHandleDataUpdate);
 
-        m_pModel->setColumnVisible(m_columnVisible);
+        updateModelColumVisibilityCache();
     }
 }
@@ -988 +1023 @@
     if (m_pModel)
         m_pModel->setColumnVisible(m_columnVisible);
-    if (m_pProxyModel)
-        m_pProxyModel->reFilter();
+    /* Notify the table view for the changed column visibility: */
+    if (m_pTableView)
+        m_pTableView->updateColumVisibility();
 }