Changeset 108037 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Feb 3, 2025 5:40:24 PM (3 months ago)

Author:

vboxsync

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

167310

Message:

FE/Qt: bugref:10814: VBox Manager / Tools pane: Handle extra-button press, geometry and layout update; For now we handle it the only possible way to toggle name plates.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager/tools

Files:

• UIToolsItem.cpp (modified) (3 diffs)
• UIToolsModel.cpp (modified) (3 diffs)
• UIToolsModel.h (modified) (2 diffs)

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

@@ -293 +293 @@
     /* And Tools-item content to take into account: */
     int iToolsItemWidth = m_pixmapSize.width();
-    if (model()->tools()->isPopup())
+    if (   model()->tools()->isPopup()
+        || model()->showItemNames())
         iToolsItemWidth += iSpacing + m_nameSize.width();
     iProposedWidth += iToolsItemWidth;
@@ -865 +866 @@
         const int iNameY = (iFullHeight - m_nameSize.height()) / 2;
         /* Paint name (always for popup mode, if requested otherwise): */
-        if (model()->tools()->isPopup())
+        if (   model()->tools()->isPopup()
+            || model()->showItemNames())
             paintText(/* Painter: */
                       pPainter,
@@ -909 +911 @@
     pPainter->setClipPath(painterPath);
     QColor backgroundColor2 = uiCommon().isInDarkMode()
-                            ? backgroundColor.lighter(150)
-                            : backgroundColor.darker(150);
+                            ? backgroundColor.lighter(140)
+                            : backgroundColor.darker(140);
     pPainter->fillRect(subRect, backgroundColor2);
 

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

@@ -66 +66 @@
     , m_pScene(0)
     , m_fItemsEnabled(true)
+    , m_fShowItemNames(false)
 {
     prepare();
@@ -317 +318 @@
             return pItem;
     return 0;
+}
+
+bool UIToolsModel::showItemNames() const
+{
+    return m_fShowItemNames;
 }
 
@@ -436 +442 @@
                         if (pClickedItem)
                         {
+                            /* Toggle the button: */
+                            if (pClickedItem->hasExtraButton())
+                            {
+                                m_fShowItemNames = !m_fShowItemNames;
+                                foreach (UIToolsItem *pItem, m_items)
+                                    pItem->updateGeometry();
+                                updateLayout();
+                            }
+
                             /* Make clicked item the current one: */
                             if (pClickedItem->isEnabled())

trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsModel.h

@@ -129 +129 @@
         /** Returns the item of passed @a enmType. */
         UIToolsItem *item(UIToolType enmType) const;
+
+        /** Returns whether we should show item names. */
+        bool showItemNames() const;
 
         /** Returns whether at least one item hovered. */
@@ -270 +273 @@
         /** Holds the root stack. */
         QList<UIToolsItem*>  m_items;
+
+        /** Holds whether children should show names. */
+        bool  m_fShowItemNames;
     /** @} */