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

Timestamp:

May 19, 2015 9:40:09 AM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: 6278: Settings dialog: Selector: Enable use of the HiDPI icons, adjust size-hint accordingly.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/settings/VBoxSettingsSelector.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/VBoxSettingsSelector.cpp

@@ -191 +191 @@
     sizePolicy.setVerticalStretch (0);
     sizePolicy.setHeightForWidth (mTwSelector->sizePolicy().hasHeightForWidth());
+    const QStyle *pStyle = QApplication::style();
+    const int iIconMetric = pStyle->pixelMetric(QStyle::PM_SmallIconSize);
     mTwSelector->setSizePolicy (sizePolicy);
     mTwSelector->setVerticalScrollBarPolicy (Qt::ScrollBarAlwaysOff);
@@ -196 +198 @@
     mTwSelector->setRootIsDecorated (false);
     mTwSelector->setUniformRowHeights (true);
-    mTwSelector->setIconSize(QSize(24, 24));
+    mTwSelector->setIconSize(QSize(1.5 * iIconMetric, 1.5 * iIconMetric));
     /* Add the columns */
     mTwSelector->headerItem()->setText (treeWidget_Category, "Category");
@@ -291 +293 @@
 {
     /* Get recommended size hint: */
+    const QStyle *pStyle = QApplication::style();
+    const int iIconMetric = pStyle->pixelMetric(QStyle::PM_SmallIconSize);
     int iItemWidth = static_cast<QAbstractItemView*>(mTwSelector)->sizeHintForColumn(treeWidget_Category);
-    int iItemHeight = qMax(24 /* icon height */, mTwSelector->fontMetrics().height() /* text height */);
+    int iItemHeight = qMax((int)(iIconMetric * 1.5) /* icon height */,
+                           mTwSelector->fontMetrics().height() /* text height */);
     /* Add some margin to every item in the tree: */
     iItemHeight += 4 /* margin itself */ * 2 /* margin count */;
@@ -298 +303 @@
     mTwSelector->setSizeHintForItems(QSize(iItemWidth , iItemHeight));
 
-    /* Fix selector width to minimum possible: */
+    /* Adjust selector width/height: */
     mTwSelector->setFixedWidth(iItemWidth + 2 * mTwSelector->frameWidth());
+    mTwSelector->setMinimumHeight(mTwSelector->topLevelItemCount() * iItemHeight +
+                                  1 /* margin itself */ * 2 /* margin count */);
 
     /* Sort selector by the id column: */