]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Fix filtering issue in combination with expanded items
authorPeter Penz <peter.penz19@gmail.com>
Wed, 14 Dec 2011 21:58:00 +0000 (22:58 +0100)
committerPeter Penz <peter.penz19@gmail.com>
Wed, 14 Dec 2011 21:59:10 +0000 (22:59 +0100)
When items have been expanded they should never get filtered, as
each child item must have a parent item.

src/kitemviews/kfileitemmodel.cpp

index e4ff2630a77b6f67a8482ed3c76b905b7a3954eb..46f00361e358bcd4b2f552c63c0b685edb934557 100644 (file)
@@ -512,8 +512,12 @@ void KFileItemModel::setNameFilter(const QString& nameFilter)
 
         foreach (ItemData* itemData, m_itemData) {
             if (!m_filter.matches(itemData->item)) {
 
         foreach (ItemData* itemData, m_itemData) {
             if (!m_filter.matches(itemData->item)) {
-                newFilteredItems.append(itemData->item);
-                m_filteredItems.insert(itemData->item);
+                // Only filter non-expanded items as child items may never
+                // exist without a parent item
+                if (!itemData->values.value("isExpanded").toBool()) {
+                    newFilteredItems.append(itemData->item);
+                    m_filteredItems.insert(itemData->item);
+                }
             }
         }
 
             }
         }