Changeset 93999 in vbox

Timestamp:

Feb 28, 2022 10:45:46 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: qt6: In qt6 there is now a QEnterEvent so the enterEvent signature changed and made if difficult to call enterEvent() from leaveEvent. bugref:9898

File:

• trunk/src/VBox/Frontends/VirtualBox/src/widgets/UITabBar.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UITabBar.cpp

@@ -114 +114 @@
     virtual void mouseMoveEvent(QMouseEvent *pEvent) RT_OVERRIDE;
     /** Handles mouse-enter @a pEvent. */
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    virtual void enterEvent(QEnterEvent *pEvent) RT_OVERRIDE;
+#else
     virtual void enterEvent(QEvent *pEvent) RT_OVERRIDE;
+#endif
     /** Handles mouse-leave @a pEvent. */
     virtual void leaveEvent(QEvent *pEvent) RT_OVERRIDE;
@@ -575 +579 @@
 }
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+void UITabBarItem::enterEvent(QEnterEvent *pEvent)
+#else
 void UITabBarItem::enterEvent(QEvent *pEvent)
+#endif
 {
     /* Make sure button isn't hovered: */
@@ -594 +602 @@
     /* Make sure button is hovered: */
     if (!m_fHovered)
+    {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) /** @todo qt6: Code duplication of enterEvent; split out in separate method (complete wast of time to cook up a QEnterEvent here). */
+# ifdef VBOX_WS_MAC
+        m_pLayoutStacked->setCurrentWidget(m_pButtonClose);
+# endif
+        m_fHovered = true;
+        /* And call for repaint: */
+        update();
+        RT_NOREF(pEvent);
+        return;
+#else
         return QWidget::enterEvent(pEvent);
+#endif
+    }
 
     /* Invert hovered state: */