Changeset 78005 in vbox for trunk

Timestamp:

Apr 3, 2019 4:43:47 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9080: Handle only events sent to required object and call to base-class afterwards, eventFilter is a virtual function first of all.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso

Files:

• UIVisoBrowserBase.cpp (modified) (2 diffs)
• UIVisoConfigurationPanel.cpp (modified) (5 diffs)
• UIVisoConfigurationPanel.h (modified) (3 diffs)
• UIVisoCreator.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoBrowserBase.cpp

@@ -100 +100 @@
 bool UILocationSelector::eventFilter(QObject *pObj, QEvent *pEvent)
 {
-    if (pObj == m_pLineEdit)
-    {
-        if(pEvent->type() == QEvent::MouseButtonPress)
-        {
-            QMouseEvent *pMouseEvent = dynamic_cast<QMouseEvent*>(pEvent);
-            if (pMouseEvent && pMouseEvent->button() == Qt::LeftButton)
-                emit sigExpandCollapseTreeView();
-        }
-    }
-    /* Pass the events to event system for further processing: */
-    return false;
+    /* Handle only events sent to m_pLineEdit only: */
+    if (pObj != m_pLineEdit)
+        return QIWithRetranslateUI<QWidget>::eventFilter(pObj, pEvent);
+
+    if (pEvent->type() == QEvent::MouseButtonPress)
+    {
+        QMouseEvent *pMouseEvent = dynamic_cast<QMouseEvent*>(pEvent);
+        if (pMouseEvent && pMouseEvent->button() == Qt::LeftButton)
+            emit sigExpandCollapseTreeView();
+    }
+
+    /* Call to base-class: */
+    return QIWithRetranslateUI<QWidget>::eventFilter(pObj, pEvent);
 }
 
@@ -230 +232 @@
 bool UIVisoBrowserBase::eventFilter(QObject *pObj, QEvent *pEvent)
 {
-    if (pObj == m_pTreeView)
-    {
-        if(pEvent->type() == QEvent::KeyPress)
-        {
-            QKeyEvent *pKeyEvent = dynamic_cast<QKeyEvent*>(pEvent);
-            if (pKeyEvent &&
-                (pKeyEvent->key() == Qt::Key_Return ||
-                 pKeyEvent->key() == Qt::Key_Enter))
-            {
-                updateTreeViewGeometry(false);
-            }
-        }
-        else if (pEvent->type() == QEvent::FocusOut)
+    /* Handle only events sent to m_pTreeView only: */
+    if (pObj != m_pTreeView)
+        return QIWithRetranslateUI<QWidget>::eventFilter(pObj, pEvent);
+
+    if (pEvent->type() == QEvent::KeyPress)
+    {
+        QKeyEvent *pKeyEvent = dynamic_cast<QKeyEvent*>(pEvent);
+        if (pKeyEvent &&
+            (pKeyEvent->key() == Qt::Key_Return ||
+             pKeyEvent->key() == Qt::Key_Enter))
         {
             updateTreeViewGeometry(false);
         }
     }
-    return false;
+    else if (pEvent->type() == QEvent::FocusOut)
+    {
+        updateTreeViewGeometry(false);
+    }
+
+    /* Call to base-class: */
+    return QIWithRetranslateUI<QWidget>::eventFilter(pObj, pEvent);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoConfigurationPanel.cpp

@@ -26 +26 @@
 #include "QIToolButton.h"
 #include "UIVisoConfigurationPanel.h"
+#include "UIVisoCreator.h"
 
-UIVisoConfigurationPanel::UIVisoConfigurationPanel(QWidget *pParent /* =0 */)
+UIVisoConfigurationPanel::UIVisoConfigurationPanel(UIVisoCreator *pCreator, QWidget *pParent /* =0 */)
     : UIDialogPanel(pParent)
+    , m_pCreator(pCreator)
     , m_pVisoNameLabel(0)
     , m_pCustomOptionsLabel(0)
@@ -69 +71 @@
     if (!mainLayout())
         return;
+
+    /* Install creator's event-filter: */
+    m_pCreator->installEventFilter(this);
 
     /* Name edit and and label: */
@@ -111 +116 @@
 bool UIVisoConfigurationPanel::eventFilter(QObject *pObject, QEvent *pEvent)
 {
+    /* Handle only events sent to creator only: */
+    if (pObject != m_pCreator)
+        return UIDialogPanel::eventFilter(pObject, pEvent);
+
     switch (pEvent->type())
     {
@@ -116 +125 @@
         {
             QKeyEvent *pKeyEvent = static_cast<QKeyEvent*>(pEvent);
-
-             if (pKeyEvent->key() == Qt::Key_Return && m_pCustomOptionsComboBox && m_pCustomOptionsComboBox->hasFocus())
-                 addCustomVisoOption();
+            if (pKeyEvent->key() == Qt::Key_Return && m_pCustomOptionsComboBox && m_pCustomOptionsComboBox->hasFocus())
+                addCustomVisoOption();
             return true;
             break;
@@ -125 +133 @@
         break;
     }
+
+    /* Call to base-class: */
     return UIDialogPanel::eventFilter(pObject, pEvent);
 }

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoConfigurationPanel.h

@@ -30 +30 @@
 class QILineEdit;
 class QIToolButton;
+class UIVisoCreator;
 
 class UIVisoConfigurationPanel : public UIDialogPanel
@@ -41 +42 @@
 
 public:
-    UIVisoConfigurationPanel(QWidget *pParent = 0);
+    UIVisoConfigurationPanel(UIVisoCreator *pCreator, QWidget *pParent = 0);
     ~UIVisoConfigurationPanel();
     virtual QString panelName() const /* override */;
@@ -64 +65 @@
     void emitCustomVisoOptions();
 
+    /** Holds the parent creator reference. */
+    UIVisoCreator *m_pCreator;
+
     QILabel      *m_pVisoNameLabel;
     QILabel      *m_pCustomOptionsLabel;

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreator.cpp

@@ -308 +308 @@
     }
 
-    m_pConfigurationPanel = new UIVisoConfigurationPanel;
+    m_pConfigurationPanel = new UIVisoConfigurationPanel(this);
     if (m_pConfigurationPanel)
     {
@@ -315 +315 @@
         m_pConfigurationPanel->setVisoName(m_visoOptions.m_strVisoName);
         m_pConfigurationPanel->setVisoCustomOptions(m_visoOptions.m_customOptions);
-        installEventFilter(m_pConfigurationPanel);
     }