Changeset 41250 in vbox

Timestamp:

May 10, 2012 11:59:26 PM (13 years ago)

Author:

vboxsync

Message:

FE/Qt: 5590: Reworking UIPopupBox to use local event-filters instead global event-filter for mouse-processing.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/widgets

Files:

• UIPopupBox.cpp (modified) (4 diffs)
• UIPopupBox.h (modified) (1 diff)

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

@@ -60 +60 @@
     connect(m_pTitleLabel, SIGNAL(linkActivated(const QString)), this, SIGNAL(titleClicked(const QString)));
 
-    /* Install event-filter: */
-    qApp->installEventFilter(this);
+    /* Install local event-filters: */
+    installEventFilter(this);
+    m_pTitleIcon->installEventFilter(this);
+    m_pWarningIcon->installEventFilter(this);
+    m_pTitleLabel->installEventFilter(this);
 }
 
@@ -131 +134 @@
     if (m_pContentWidget)
     {
+        m_pContentWidget->removeEventFilter(this);
         layout()->removeWidget(m_pContentWidget);
-//        m_pContentWidget->removeEventFilter(this);
     }
     m_pContentWidget = pWidget;
-//    m_pContentWidget->installEventFilter(this);
-//    m_pContentWidget->setMouseTracking(true);
-    layout()->addWidget(pWidget);
+    layout()->addWidget(m_pContentWidget);
+    m_pContentWidget->installEventFilter(this);
     recalc();
 }
@@ -183 +185 @@
 {
     QEvent::Type type = pEvent->type();
-    if (   type == QEvent::MouseMove
-        || type == QEvent::Wheel
-        || type == QEvent::Resize
-        || type == QEvent::Enter
-        || type == QEvent::Leave)
+    if (type == QEvent::Enter ||
+        type == QEvent::Leave ||
+        type == QEvent::MouseMove ||
+        type == QEvent::Wheel)
         updateHover();
     return false;
@@ -202 +203 @@
 {
     toggleOpen();
-}
-
-void UIPopupBox::mouseMoveEvent(QMouseEvent *pEvent)
-{
-    updateHover();
-    QWidget::mouseMoveEvent(pEvent);
-}
-
-void UIPopupBox::wheelEvent(QWheelEvent *pEvent)
-{
-    updateHover();
-    QWidget::wheelEvent(pEvent);
-}
-
-void UIPopupBox::enterEvent(QEvent *pEvent)
-{
-    updateHover();
-    QWidget::enterEvent(pEvent);
-}
-
-void UIPopupBox::leaveEvent(QEvent *pEvent)
-{
-    updateHover();
-    QWidget::leaveEvent(pEvent);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h

@@ -72 +72 @@
     void resizeEvent(QResizeEvent *pEvent);
     void mouseDoubleClickEvent(QMouseEvent *pEvent);
-    void mouseMoveEvent(QMouseEvent *pEvent);
-    void wheelEvent(QWheelEvent *pEvent);
-    void enterEvent(QEvent *pEvent);
-    void leaveEvent(QEvent *pEvent);
     void paintEvent(QPaintEvent *pEvent);