summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjghali <jghali@11d20701-8431-0410-a711-e3c959e3b870>2012-02-02 22:02:26 +0000
committerjghali <jghali@11d20701-8431-0410-a711-e3c959e3b870>2012-02-02 22:02:26 +0000
commit5bbc18c87ad7c6de4e421ebb32d0765deda7029a (patch)
tree6759124227fff88dfd7f79d303532582ab50d125
parentaa83f9d0cfe1d19d4efece08e4ad6c5c5d87424e (diff)
downloadscribus-5bbc18c87ad7c6de4e421ebb32d0765deda7029a.tar.gz
scribus-5bbc18c87ad7c6de4e421ebb32d0765deda7029a.tar.xz
scribus-5bbc18c87ad7c6de4e421ebb32d0765deda7029a.zip
#10565: "Outline Palette" content jumps up/down (on focus) when filter is used
git-svn-id: svn://scribus.net/branches/Version14x/Scribus@17269 11d20701-8431-0410-a711-e3c959e3b870
-rw-r--r--scribus/outlinepalette.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/scribus/outlinepalette.cpp b/scribus/outlinepalette.cpp
index 5a0f058..847bc19 100644
--- a/scribus/outlinepalette.cpp
+++ b/scribus/outlinepalette.cpp
@@ -404,7 +404,7 @@ void OutlinePalette::slotShowSelect(uint SNr, int Nr)
{
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 @@ void OutlinePalette::slotShowSelect(uint SNr, int Nr)
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 @@ void OutlinePalette::BuildTree(bool storeVals)
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)));