Changeset 69639 in vbox

Timestamp:

Nov 10, 2017 12:25:43 PM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

119003

Message:

FE/Qt: bugref:8694: Selector UI: HiDPI support for graphics code (chooser/details).

Location:

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics

Files:

• chooser/UIGChooserItemGroup.cpp (modified) (8 diffs)
• chooser/UIGChooserItemMachine.cpp (modified) (1 diff)
• details/UIGDetailsElement.cpp (modified) (2 diffs)
• details/UIGDetailsElement.h (modified) (1 diff)
• details/UIGDetailsGroup.cpp (modified) (1 diff)
• details/UIGDetailsSet.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItemGroup.cpp

@@ -382 +382 @@
     {
         /* Layout hints: */
-        case GroupItemData_HorizonalMargin: return 5;
-        case GroupItemData_VerticalMargin: return 5;
-        case GroupItemData_MajorSpacing: return 10;
-        case GroupItemData_MinorSpacing: return 3;
-        case GroupItemData_RootIndent: return 2;
+        case GroupItemData_HorizonalMargin: return QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) / 4;
+        case GroupItemData_VerticalMargin: return QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) / 4;
+        case GroupItemData_MajorSpacing: return QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) / 2;
+        case GroupItemData_MinorSpacing: return QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) / 5;
+        case GroupItemData_RootIndent: return QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) / 6;
 
         /* Default: */
@@ -410 +410 @@
     m_nameFont.setWeight(QFont::Bold);
     m_infoFont = font();
-    m_groupsPixmap = QPixmap(":/group_abstract_16px.png");
-    m_machinesPixmap = QPixmap(":/machine_abstract_16px.png");
+    const int iIconMetric = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize);
+    m_groupsPixmap = UIIconPool::iconSet(":/group_abstract_16px.png").pixmap(iIconMetric, iIconMetric);
+    m_machinesPixmap = UIIconPool::iconSet(":/machine_abstract_16px.png").pixmap(iIconMetric, iIconMetric);
     m_pixmapSizeGroups = m_groupsPixmap.size();
     m_pixmapSizeMachines = m_machinesPixmap.size();
@@ -1560 +1561 @@
     QColor bodyColor = pal.color(QPalette::Active, QPalette::Base);
 
+    /* Invent pixel metric: */
+    const int iMetric = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) / 2;
+
     /* Root-item: */
     if (isRoot())
@@ -1582 +1586 @@
             QPainterPath path;
             path.moveTo(iRootIndent, 0);
-            path.lineTo(path.currentPosition().x(), iFullHeaderHeight - 10);
-            path.arcTo(QRectF(path.currentPosition(), QSizeF(20, 20)).translated(0, -10), 180, 90);
-            path.lineTo(rect.width() - 10 - iRootIndent, path.currentPosition().y());
-            path.arcTo(QRectF(path.currentPosition(), QSizeF(20, 20)).translated(-10, -20), 270, 90);
+            path.lineTo(path.currentPosition().x(), iFullHeaderHeight - iMetric);
+            path.arcTo(QRectF(path.currentPosition(), QSizeF(2 * iMetric, 2 * iMetric)).translated(0, -iMetric), 180, 90);
+            path.lineTo(rect.width() - iMetric - iRootIndent, path.currentPosition().y());
+            path.arcTo(QRectF(path.currentPosition(), QSizeF(2 * iMetric, 2 * iMetric)).translated(-iMetric, -2 * iMetric), 270, 90);
             path.lineTo(path.currentPosition().x(), 0);
             path.closeSubpath();
@@ -1612 +1616 @@
         /* Add clipping: */
         QPainterPath path;
-        path.moveTo(10, 0);
-        path.arcTo(QRectF(path.currentPosition(), QSizeF(20, 20)).translated(-10, 0), 90, 90);
-        path.lineTo(path.currentPosition().x(), iFullHeight - 10);
-        path.arcTo(QRectF(path.currentPosition(), QSizeF(20, 20)).translated(0, -10), 180, 90);
-        path.lineTo(rect.width() - 10, path.currentPosition().y());
-        path.arcTo(QRectF(path.currentPosition(), QSizeF(20, 20)).translated(-10, -20), 270, 90);
-        path.lineTo(path.currentPosition().x(), 10);
-        path.arcTo(QRectF(path.currentPosition(), QSizeF(20, 20)).translated(-20, -10), 0, 90);
+        path.moveTo(iMetric, 0);
+        path.arcTo(QRectF(path.currentPosition(), QSizeF(2 * iMetric, 2 * iMetric)).translated(-iMetric, 0), 90, 90);
+        path.lineTo(path.currentPosition().x(), iFullHeight - iMetric);
+        path.arcTo(QRectF(path.currentPosition(), QSizeF(2 * iMetric, 2 * iMetric)).translated(0, -iMetric), 180, 90);
+        path.lineTo(rect.width() - iMetric, path.currentPosition().y());
+        path.arcTo(QRectF(path.currentPosition(), QSizeF(2 * iMetric, 2 * iMetric)).translated(-iMetric, -2 * iMetric), 270, 90);
+        path.lineTo(path.currentPosition().x(), iMetric);
+        path.arcTo(QRectF(path.currentPosition(), QSizeF(2 * iMetric, 2 * iMetric)).translated(-2 * iMetric, -iMetric), 0, 90);
         path.closeSubpath();
         pPainter->setClipPath(path);
@@ -1753 +1757 @@
                       m_strInfoMachines);
 
-            iHorizontalIndent -= m_pixmapSizeMachines.width();
+            iHorizontalIndent -= (m_pixmapSizeMachines.width() + iMinorSpacing);
             int iMachinePixmapX = iHorizontalIndent;
             int iMachinePixmapY = m_pixmapSizeMachines.height() == iFullHeaderHeight ?
@@ -1763 +1767 @@
                         /* Pixmap to paint: */
                         m_machinesPixmap);
+
+            /* Indent between machines and groups: */
+            iHorizontalIndent -= iMinorSpacing;
         }
 
@@ -1783 +1790 @@
                       m_strInfoGroups);
 
-            iHorizontalIndent -= m_pixmapSizeGroups.width();
+            iHorizontalIndent -= (m_pixmapSizeGroups.width() + iMinorSpacing);
             int iGroupPixmapX = iHorizontalIndent;
             int iGroupPixmapY = m_pixmapSizeGroups.height() == iFullHeaderHeight ?

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItemMachine.cpp

@@ -197 +197 @@
     {
         /* Layout hints: */
-        case MachineItemData_Margin: return 5;
-        case MachineItemData_MajorSpacing: return 10;
-        case MachineItemData_MinorSpacing: return 4;
+        case MachineItemData_Margin: return QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) / 4;
+        case MachineItemData_MajorSpacing: return QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) / 2;
+        case MachineItemData_MinorSpacing: return QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) / 4;
         case MachineItemData_TextSpacing: return 0;
 

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsElement.cpp

@@ -46 +46 @@
     , m_pSet(pParent)
     , m_type(type)
-    , m_iCornerRadius(10)
+    , m_iCornerRadius(QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) / 2)
     , m_iMinimumHeaderWidth(0)
     , m_iMinimumHeaderHeight(0)
@@ -216 +216 @@
     {
         /* Hints: */
-        case ElementData_Margin: return 5;
-        case ElementData_Spacing: return 10;
-        case ElementData_MinimumTextColumnWidth: return 100;
+        case ElementData_Margin: return QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) / 4;
+        case ElementData_Spacing: return QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) / 2;
         /* Default: */
         default: break;

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsElement.h

@@ -114 +114 @@
         /* Hints: */
         ElementData_Margin,
-        ElementData_Spacing,
-        ElementData_MinimumTextColumnWidth
+        ElementData_Spacing
     };
 

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsGroup.cpp

@@ -128 +128 @@
     {
         /* Layout hints: */
-        case GroupData_Margin: return 2;
-        case GroupData_Spacing: return 10;
+        case GroupData_Margin: return QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) / 6;
+        case GroupData_Spacing: return QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) / 2;
         /* Default: */
         default: break;

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsSet.cpp

@@ -233 +233 @@
         /* Layout hints: */
         case SetData_Margin: return 0;
-        case SetData_Spacing: return 3;
+        case SetData_Spacing: return QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) / 5;
         /* Default: */
         default: break;