Changeset 85303 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jul 13, 2020 10:10:35 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9686. Trying to handle column width a bit better by considering the sort indicator icon's width

Location:

trunk/src/VBox/Frontends/VirtualBox/src/monitor/resource

Files:

• UIResourceMonitor.cpp (modified) (4 diffs)
• UIResourceMonitor.h (modified) (1 diff)

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

@@ -1199 +1199 @@
     , m_pHostStatsWidget(0)
     , m_fIsCurrentTool(true)
+    , m_iSortIndicatorWidth(0)
 {
     prepare();
@@ -1268 +1269 @@
 void UIResourceMonitorWidget::prepare()
 {
+    /* Try to guest the sort indicator's width: */
+    int iIndicatorMargin = 3;
+    QIcon sortIndicator = qApp->QApplication::style()->standardIcon(QStyle::SP_TitleBarUnshadeButton);
+    QList<QSize> iconSizes = sortIndicator.availableSizes();
+    foreach(const QSize &msize, iconSizes)
+        m_iSortIndicatorWidth = qMax(m_iSortIndicatorWidth, msize.width());
+    if (m_iSortIndicatorWidth == 0)
+        m_iSortIndicatorWidth = 20;
+    m_iSortIndicatorWidth += 2 * iIndicatorMargin;
+
     loadHiddenColumnList();
     prepareWidgets();
@@ -1446 +1457 @@
     QFontMetrics fontMetrics(m_pTableView->font());
     const QMap<int, int> &columnDataStringLengths = m_pModel->dataLengths();
-
     QMap<int, int> columnWidthsInPixels;
     for (int i = 0; i < (int)VMResourceMonitorColumn_Max; ++i)
@@ -1455 +1465 @@
         columnWidthsInPixels[i] = iMax * fontMetrics.width('x') +
             QApplication::style()->pixelMetric(QStyle::PM_LayoutLeftMargin) +
-            QApplication::style()->pixelMetric(QStyle::PM_LayoutRightMargin);
+            QApplication::style()->pixelMetric(QStyle::PM_LayoutRightMargin) +
+            m_iSortIndicatorWidth;
     }
     m_pTableView->setMinimumColumnWidths(columnWidthsInPixels);

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

@@ -122 +122 @@
     /** Indicates if this widget's host tool is current tool. */
     bool    m_fIsCurrentTool;
+    int     m_iSortIndicatorWidth;
 };