Changeset 108310 in vbox

Timestamp:

Feb 20, 2025 1:18:42 PM (2 months ago)

Author:

vboxsync

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

167654

Message:

FE/Qt: bugref:10814: VBox Manager / Tools pane: Smaller Machine tool icons in widget mode; That also implies a bit of indent for the pixmap and name.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsItem.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsItem.cpp

@@ -591 +591 @@
 void UIToolsItem::updatePixmap()
 {
-    /* Prepare variables: */
-    const int iIconMetric = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) * 1.5;
+    /* Smaller Machine tool icons in widget mode: */
+    const int iIconMetric = model()->isPopup() || itemClass() != UIToolClass_Machine
+                          ? QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) * 1.5
+                          : QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize);
 
     /* Prepare new pixmap size: */
@@ -894 +896 @@
         /* Prepare variables: */
 #ifdef VBOX_WS_MAC
-        const int iPixmapX = model()->isPopup() ? iMargin : 2 * iMargin;
+        int iPixmapX = model()->isPopup() ? iMargin : 2 * iMargin;
 #else
-        const int iPixmapX = model()->isPopup() ? iMargin : 1.5 * iMargin;
+        int iPixmapX = model()->isPopup() ? iMargin : 1.5 * iMargin;
 #endif
+
+        /* A bit of indentation for Machine tools in widget mode: */
+        if (!model()->isPopup() && itemClass() == UIToolClass_Machine)
+            iPixmapX += QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) * .5;
+
         const int iPixmapY = (iFullHeight - m_pixmap.height() / m_pixmap.devicePixelRatio()) / 2;
         /* Paint pixmap: */
@@ -913 +920 @@
         /* Prepare variables: */
 #ifdef VBOX_WS_MAC
-        const int iNameX = model()->isPopup() ? iMargin + m_pixmapSize.width() + iSpacing
-                                                       : 2 * iMargin + m_pixmapSize.width() + 2 * iSpacing;
+        int iNameX = model()->isPopup() ? iMargin + m_pixmapSize.width() + iSpacing
+                                        : 2 * iMargin + m_pixmapSize.width() + 2 * iSpacing;
 #else
-        const int iNameX = model()->isPopup() ? iMargin + m_pixmapSize.width() + iSpacing
-                                                       : 1.5 * iMargin + m_pixmapSize.width() + 2 * iSpacing;
+        int iNameX = model()->isPopup() ? iMargin + m_pixmapSize.width() + iSpacing
+                                        : 1.5 * iMargin + m_pixmapSize.width() + 2 * iSpacing;
 #endif
+
+        /* A bit of indentation for Machine tools in widget mode: */
+        if (!model()->isPopup() && itemClass() == UIToolClass_Machine)
+            iNameX += QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) * .5;
+
         const int iNameY = (iFullHeight - m_nameSize.height()) / 2;
         /* Paint name (always for popup mode, if requested otherwise): */