Changeset 108124 in vbox

Timestamp:

Feb 9, 2025 5:53:03 PM (3 months ago)

Author:

vboxsync

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

167423

Message:

FE/Qt: bugref:10814: VBox Manager / Tools pane: Smaller margins for non-macOS hosts.

File:

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

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

@@ -289 +289 @@
     /* Add 2 margins by default: */
     iProposedWidth += 2 * iMargin;
+#ifdef VBOX_WS_MAC
     /* Additional 3 margins for widget mode: */
     if (!model()->tools()->isPopup())
         iProposedWidth += 3 * iMargin;
+#else
+    /* Additional 1 margin for widget mode: */
+    if (!model()->tools()->isPopup())
+        iProposedWidth += iMargin;
+#endif
 
     /* Add pixmap size by default: */
@@ -775 +781 @@
             subRect.setHeight(m_pixmap.height() / m_pixmap.devicePixelRatio() + iPadding * 2);
             subRect.setWidth(subRect.height());
+#ifdef VBOX_WS_MAC
             subRect.moveTopLeft(rectangle.topLeft() + QPoint(2.5 * iMargin - iPadding, iMargin - iPadding));
+#else
+            subRect.moveTopLeft(rectangle.topLeft() + QPoint(1.5 * iMargin - iPadding, iMargin - iPadding));
+#endif
 
             /* Paint icon frame: */
@@ -883 +893 @@
     {
         /* Prepare variables: */
+#ifdef VBOX_WS_MAC
         const int iPixmapX = model()->tools()->isPopup() ? iMargin : 2.5 * iMargin;
+#else
+        const int iPixmapX = model()->tools()->isPopup() ? iMargin : 1.5 * iMargin;
+#endif
         const int iPixmapY = (iFullHeight - m_pixmap.height() / m_pixmap.devicePixelRatio()) / 2;
         /* Paint pixmap: */
@@ -897 +911 @@
     {
         /* Prepare variables: */
+#ifdef VBOX_WS_MAC
         const int iNameX = model()->tools()->isPopup() ? iMargin + m_pixmapSize.width() + iSpacing
                                                        : 2.5 * iMargin + m_pixmapSize.width() + 2 * iSpacing;
+#else
+        const int iNameX = model()->tools()->isPopup() ? iMargin + m_pixmapSize.width() + iSpacing
+                                                       : 1.5 * iMargin + m_pixmapSize.width() + 2 * iSpacing;
+#endif
         const int iNameY = (iFullHeight - m_nameSize.height()) / 2;
         /* Paint name (always for popup mode, if requested otherwise): */