Changeset 108123 in vbox for trunk/src/VBox/Frontends

Timestamp:

Feb 9, 2025 5:51:31 PM (3 months ago)

Author:

vboxsync

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

167422

Message:

FE/Qt: bugref:10814: VBox Manager / Tools pane: A bit of extra-spacing for tool item's icon and name in widget mode.

File:

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

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

@@ -287 +287 @@
     int iProposedWidth = 0;
 
-    /* Two margins: */
+    /* Add 2 margins by default: */
     iProposedWidth += 2 * iMargin;
+    /* Additional 3 margins for widget mode: */
     if (!model()->tools()->isPopup())
         iProposedWidth += 3 * iMargin;
-    /* And Tools-item content to take into account: */
-    int iToolsItemWidth = m_pixmapSize.width();
+
+    /* Add pixmap size by default: */
+    iProposedWidth += m_pixmapSize.width();
+
+    /* Add text size for popup mode or
+     * if it's requested for widget mode: */
     if (   model()->tools()->isPopup()
         || model()->showItemNames())
-        iToolsItemWidth += iSpacing + m_nameSize.width();
-    iProposedWidth += iToolsItemWidth;
+    {
+        iProposedWidth += m_nameSize.width();
+
+        /* Add 1 spacing by default: */
+        iProposedWidth += iSpacing;
+        /* Additional 1 spacing for widget mode: */
+        if (!model()->tools()->isPopup())
+            iProposedWidth += iSpacing;
+    }
 
     /* Return result: */
@@ -886 +898 @@
         /* Prepare variables: */
         const int iNameX = model()->tools()->isPopup() ? iMargin + m_pixmapSize.width() + iSpacing
-                                                       : 2.5 * iMargin + m_pixmapSize.width() + iSpacing;
+                                                       : 2.5 * iMargin + m_pixmapSize.width() + 2 * iSpacing;
         const int iNameY = (iFullHeight - m_nameSize.height()) / 2;
         /* Paint name (always for popup mode, if requested otherwise): */