Changeset 68328 in vbox

Timestamp:

Aug 8, 2017 7:46:36 AM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8928: Fixing UIFilePathSelector regression caused by QIComboBox rework which breaks the focusing rules; Also make sure corresponding event-filters are installed for editable combo-box only.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extensions/QIComboBox.cpp (modified) (1 diff)
• extensions/QIComboBox.h (modified) (1 diff)
• widgets/UIFilePathSelector.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIComboBox.cpp

@@ -166 +166 @@
     AssertPtrReturn(m_pComboBox, 0);
     return m_pComboBox->lineEdit();
+}
+
+QComboBox *QIComboBox::comboBox() const
+{
+    return m_pComboBox;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIComboBox.h

@@ -113 +113 @@
     void setItemText(int iIndex, const QString &strText) const;
 
+protected:
+
+    /** Returns the embedded combo-box reference. */
+    QComboBox *comboBox() const;
+
 private:
 

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

@@ -126 +126 @@
     {
         QIComboBox::setEditable(true);
+
+        /* Install combo-box event-filter: */
+        Assert(comboBox());
+        comboBox()->installEventFilter(this);
+
+        /* Install line-edit connection/event-filter: */
         Assert(lineEdit());
         connect(lineEdit(), SIGNAL(textEdited(const QString &)),
                 this, SLOT(onTextEdited(const QString &)));
-
-        /* Installing necessary event filters: */
         lineEdit()->installEventFilter(this);
     }
@@ -137 +141 @@
         if (lineEdit())
         {
-            /* Installing necessary event filters: */
-            lineEdit()->installEventFilter(this);
+            /* Remove line-edit event-filter/connection: */
+            lineEdit()->removeEventFilter(this);
             disconnect(lineEdit(), SIGNAL(textEdited(const QString &)),
                        this, SLOT(onTextEdited(const QString &)));
+        }
+        if (comboBox())
+        {
+            /* Remove combo-box event-filter: */
+            comboBox()->removeEventFilter(this);
         }
         QIComboBox::setEditable(false);
@@ -177 +186 @@
 bool UIFilePathSelector::eventFilter(QObject *pObject, QEvent *pEvent)
 {
-    if (m_fMouseAwaited && (pEvent->type() == QEvent::MouseButtonPress))
-        QMetaObject::invokeMethod(this, "refreshText", Qt::QueuedConnection);
-
+    /* If the object is private combo-box: */
+    if (pObject == comboBox())
+    {
+        /* Handle focus events related to private child: */
+        switch (pEvent->type())
+        {
+            case QEvent::FocusIn:  focusInEvent(static_cast<QFocusEvent*>(pEvent)); break;
+            case QEvent::FocusOut: focusOutEvent(static_cast<QFocusEvent*>(pEvent)); break;
+            default: break;
+        }
+    }
+
+    /* If the object is private line-edit: */
+    if (pObject == lineEdit())
+    {
+        if (m_fMouseAwaited && (pEvent->type() == QEvent::MouseButtonPress))
+            QMetaObject::invokeMethod(this, "refreshText", Qt::QueuedConnection);
+    }
+
+    /* Call to base-class: */
     return QIWithRetranslateUI<QIComboBox>::eventFilter(pObject, pEvent);
 }