[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeextragear-1/k3b/src/tools
From:       Sebastian Trueg <sebastian () trueg ! de>
Date:       2004-01-23 14:22:39
Message-ID: 20040123142239.298B72A6E () office ! kde ! org
[Download RAW message or body]

CVS commit by trueg: 

fixed a crash


  M +15 -8     k3blistview.cpp   1.16


--- kdeextragear-1/k3b/src/tools/k3blistview.cpp  #1.15:1.16
@@ -30,4 +30,5 @@
 #include <qspinbox.h>
 #include <qlineedit.h>
+#include <qlistbox.h>
 #include <qevent.h>
 #include <qvalidator.h>
@@ -869,10 +870,16 @@ bool K3bListView::eventFilter( QObject* 
     }
   }
-  else if( e->type() == QEvent::FocusOut &&
-           ( o == m_editorSpinBox ||
+  else if( e->type() == QEvent::FocusOut ) {
+    if( o == m_editorSpinBox ||
              o == m_editorMsfEdit ||
-             o == m_editorLineEdit ||
-             o == m_editorComboBox ) )
+        o == m_editorLineEdit )
     hideEditor();
+    else if( o == m_editorComboBox ) {
+      // make sure we did not lose the focus to one of the combobox children
+      if( ( !m_editorComboBox->listBox() || !m_editorComboBox->listBox()->hasFocus() ) &&
+          ( !m_editorComboBox->lineEdit() || !m_editorComboBox->lineEdit()->hasFocus() ) )
+        hideEditor();
+    }
+  }
 
   return KListView::eventFilter( o, e );


[prev in list] [next in list] [prev in thread] [next in thread]