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

Timestamp:

Jan 31, 2025 12:07:01 PM (3 months ago)

Author:

vboxsync

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

167274

Message:

FE/Qt: bugref:10814: VBox Manager / Tools pane: Make sure extra-button is shown for widget mode if at least one of items is hovered.

Location:

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

Files:

• UIToolsItem.cpp (modified) (1 diff)
• UIToolsModel.cpp (modified) (5 diffs)
• UIToolsModel.h (modified) (2 diffs)

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

@@ -383 +383 @@
     paintToolInfo(pPainter, rectangle);
     /* Paint extra-button if requested: */
-    if (m_fExtraButton)
+    if (   m_fExtraButton
+        && model()->isAtLeastOneItemHovered())
         paintExtraButton(pPainter, rectangle);
 }

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

@@ -317 +317 @@
             return pItem;
     return 0;
+}
+
+bool UIToolsModel::isAtLeastOneItemHovered() const
+{
+    foreach (UIToolsItem *pItem, items())
+        if (pItem->isHovered())
+            return true;
+    return false;
 }
 
@@ -451 +459 @@
 }
 
+void UIToolsModel::sltHandleItemHoverChange()
+{
+    /* Just update all the items: */
+    foreach (UIToolsItem *pItem, items())
+        pItem->update();
+}
+
+void UIToolsModel::sltFocusItemDestroyed()
+{
+    AssertMsgFailed(("Focus item destroyed!"));
+}
+
 void UIToolsModel::sltRetranslateUI()
 {
@@ -476 +496 @@
 }
 
-void UIToolsModel::sltFocusItemDestroyed()
-{
-    AssertMsgFailed(("Focus item destroyed!"));
-}
-
 void UIToolsModel::prepare()
 {
@@ -509 +524 @@
             m_items << new UIToolsItem(scene(), UIIconPool::iconSet(":/welcome_screen_24px.png",
                                                                     ":/welcome_screen_24px.png"),
-                                       UIToolClass_Global, UIToolType_Welcome);
+                                       UIToolClass_Global, UIToolType_Welcome,
+                                       !tools()->isPopup() /* extra-button */);
 
             /* Extensions: */
@@ -584 +600 @@
     connect(&translationEventListener(), &UITranslationEventListener::sigRetranslateUI,
             this, &UIToolsModel::sltRetranslateUI);
+
+    /* Connect item hover listeners: */
+    foreach (UIToolsItem *pItem, m_items)
+    {
+        connect(pItem, &UIToolsItem::sigHoverEnter,
+                this, &UIToolsModel::sltHandleItemHoverChange);
+        connect(pItem, &UIToolsItem::sigHoverLeave,
+                this, &UIToolsModel::sltHandleItemHoverChange);
+    }
 }
 

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 at least one item hovered: */
+        bool isAtLeastOneItemHovered() const;
     /** @} */
 
@@ -185 +188 @@
 
 private slots:
+
+    /** @name Children stuff.
+      * @{ */
+       /** Handles signal about one of items was [un]hovered. */
+       void sltHandleItemHoverChange();
+    /** @} */
 
     /** @name Selection stuff.