Changeset 87898 in vbox

Timestamp:

Mar 1, 2021 11:23:42 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: QIComboBox: A fix for r142789, no line-edit for non-editable combo-box.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIComboBox.cpp (modified) (3 diffs)

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

@@ -307 +307 @@
 {
     AssertPtrReturnVoid(m_pComboBox);
-    QILineEdit *pLineEdit = qobject_cast<QILineEdit*>(m_pComboBox->lineEdit());
-    AssertPtrReturnVoid(pLineEdit);
-    pLineEdit->mark(fError, strErrorMessage);
+    QILineEdit *pLineEdit = isEditable() ? qobject_cast<QILineEdit*>(m_pComboBox->lineEdit()) : 0;
+    if (pLineEdit)
+        pLineEdit->mark(fError, strErrorMessage);
 }
 
@@ -338 +338 @@
     AssertPtrReturnVoid(m_pComboBox);
     m_pComboBox->setEditable(fEditable);
+
+    /* Replace the line-edit so that we can mark errors: */
+    if (isEditable())
+        m_pComboBox->setLineEdit(new QILineEdit);
 }
 
@@ -385 +389 @@
         AssertPtrReturnVoid(m_pComboBox);
         {
-            /* Replace the line edit of the combox box so that we can mark it for errors: */
-            QILineEdit *pLineEdit = new QILineEdit;
-            m_pComboBox->setLineEdit(pLineEdit);
             /* Configure combo-box: */
             setFocusProxy(m_pComboBox);