[fwbuilder-commits] r1662 - branches/v3_1/src/gui
Brought to you by:
mikehorn
From: <a2...@in...> - 2009-10-30 16:55:38
|
Author: a2k Date: 2009-10-30 09:54:52 -0700 (Fri, 30 Oct 2009) New Revision: 1662 Modified: branches/v3_1/src/gui/ObjectManipulator.cpp branches/v3_1/src/gui/ObjectTreeView.cpp Log: Clear filter on new object creation. Do not re-filter tree if last and current filter is emprty. Modified: branches/v3_1/src/gui/ObjectManipulator.cpp =================================================================== --- branches/v3_1/src/gui/ObjectManipulator.cpp 2009-10-29 19:58:00 UTC (rev 1661) +++ branches/v3_1/src/gui/ObjectManipulator.cpp 2009-10-30 16:54:52 UTC (rev 1662) @@ -369,6 +369,7 @@ */ void ObjectManipulator::insertSubtree(ObjectTreeViewItem *itm, FWObject *obj) { + this->m_objectManipulator->filter->clearEditText(); ObjectTreeViewItem *nitm = insertObject(itm, obj); if (nitm==NULL) return; Modified: branches/v3_1/src/gui/ObjectTreeView.cpp =================================================================== --- branches/v3_1/src/gui/ObjectTreeView.cpp 2009-10-29 19:58:00 UTC (rev 1661) +++ branches/v3_1/src/gui/ObjectTreeView.cpp 2009-10-30 16:54:52 UTC (rev 1662) @@ -894,6 +894,7 @@ void ObjectTreeView::setFilter(QString text) { + if (filter.isEmpty() && text.isEmpty()) return; filter = text; QSet<QTreeWidgetItem *> items = this->findItems(text, Qt::MatchContains|Qt::MatchRecursive, 0).toSet(); QSet<QTreeWidgetItem *> children, parents; |