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

[scribus-commit]

Author: jghali
Date: Thu Feb  2 22:03:22 2012
New Revision: 17270

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

Modified:
    trunk/Scribus/scribus/ui/outlinepalette.cpp

Modified: trunk/Scribus/scribus/ui/outlinepalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17270&path=/trunk/Scribus/scribus/ui/outlinepalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/outlinepalette.cpp (original)
+++ trunk/Scribus/scribus/ui/outlinepalette.cpp Thu Feb  2 22:03:22 2012
@@ -715,7 +715,7 @@
 		{
 			PageItem *item = currDoc->m_Selection->itemAt(a);
 			QTreeWidgetItem *retVal = getListItem(item->OwnPage, item);
-			if (retVal != 0)
+			if (retVal != 0 && !retVal->isHidden())
 				itemSelection.append(retVal);
 		}
 		reportDisplay->selectItems(itemSelection);
@@ -723,7 +723,7 @@
 	else
 	{
 		QTreeWidgetItem *retVal = getListItem(SNr, Nr);
-		if (retVal != 0)
+		if (retVal != 0 && !retVal->isHidden())
 			retVal->setSelected(true);
 	}
 	QList<QTreeWidgetItem *> items = reportDisplay->selectedItems();
@@ -1275,9 +1275,9 @@
 		reopenTree();
 	reportDisplay->invisibleRootItem()->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
 	setUpdatesEnabled(true);
+	filterTree();
 	if (currDoc->m_Selection->count() > 0)
 		slotShowSelect(0, NULL);
-	filterTree();
 	repaint();
 	connect(reportDisplay, SIGNAL(itemSelectionChanged()), this, SLOT(slotMultiSelect()));
 	connect(reportDisplay, SIGNAL(itemChanged(QTreeWidgetItem*, int)), this, SLOT(slotDoRename(QTreeWidgetItem*, int)));