Changeset 108035 in vbox

Timestamp:

Feb 3, 2025 5:33:51 PM (6 weeks ago)

Author:

vboxsync

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

167308

Message:

FE/Qt: bugref:10814: VBox Manager / Tools pane: Fixes for tool item icon and text location calculations.

File:

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

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

@@ -847 +847 @@
     {
         /* Prepare variables: */
-        int iPixmapX = model()->tools()->isPopup() ? iMargin : 2 * iMargin;
-        int iPixmapY = (iFullHeight - m_pixmap.height() / m_pixmap.devicePixelRatio()) / 2;
+        const int iPixmapX = model()->tools()->isPopup() ? iMargin : 2 * iMargin;
+        const int iPixmapY = (iFullHeight - m_pixmap.height() / m_pixmap.devicePixelRatio()) / 2;
         /* Paint pixmap: */
         paintPixmap(/* Painter: */
@@ -861 +861 @@
     {
         /* Prepare variables: */
-        int iNameX = iMargin + m_pixmapSize.width() + iSpacing;
-        int iNameY = (iFullHeight - m_nameSize.height()) / 2;
-        /* Paint name: */
-        if (model()->tools()->isPopup())
+        const int iNameX = model()->tools()->isPopup() ? iMargin + m_pixmapSize.width() + iSpacing
+                                                       : 2 * iMargin + m_pixmapSize.width() + iSpacing;
+        const int iNameY = (iFullHeight - m_nameSize.height()) / 2;
+        /* Paint name (always for popup mode, if requested otherwise): */
+        if (   model()->tools()->isPopup()
+            || model()->showItemNames())
             paintText(/* Painter: */
                       pPainter,