r17269 by jghali - #10565: "Outline Palette" content jumps up/down (on focus) when filter is used

[scribus-commit]

Author: jghali
Date: Thu Feb  2 22:02:26 2012
New Revision: 17269

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17269
Log:
#10565: "Outline Palette" content jumps up/down (on focus) when filter is used

Modified:
    branches/Version14x/Scribus/scribus/outlinepalette.cpp

Modified: branches/Version14x/Scribus/scribus/outlinepalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17269&path=/branches/Version14x/Scribus/scribus/outlinepalette.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/outlinepalette.cpp (original)
+++ branches/Version14x/Scribus/scribus/outlinepalette.cpp Thu Feb  2 22:02:26 2012
@@ -404,7 +404,7 @@
 		{
 			PageItem *item = currDoc->m_Selection->itemAt(a);
 			QTreeWidgetItem *retVal = getListItem(item->OwnPage, item->ItemNr);
-			if (retVal != 0)
+			if (retVal != 0 && !retVal->isHidden())
 				itemSelection.append(retVal);
 		}
 		reportDisplay->selectItems(itemSelection);
@@ -412,7 +412,7 @@
 	else
 	{
 		QTreeWidgetItem *retVal = getListItem(SNr, Nr);
-		if (retVal != 0)
+		if (retVal != 0 && !retVal->isHidden())
 			retVal->setSelected(true);
 	}
 	QList<QTreeWidgetItem *> items = reportDisplay->selectedItems();
@@ -823,9 +823,9 @@
 	if (storeVals)
 		reopenTree();
 	setUpdatesEnabled(true);
+	filterTree();
 	if (currDoc->m_Selection->count() > 0)
 		slotShowSelect(0, -1);
-	filterTree();
 	repaint();
 	connect(reportDisplay, SIGNAL(itemSelectionChanged()), this, SLOT(slotMultiSelect()));
 	connect(reportDisplay, SIGNAL(itemChanged(QTreeWidgetItem*, int)), this, SLOT(slotDoRename(QTreeWidgetItem*, int)));