i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed the overly complicated computation of the height of the

Browse Source 
removed rows in OutlineView::RemoveRow(BRow* row). It also
contained a bug (tracked down by Duggan in ticket #3897, thanks!)
which caused it to skip the sub-tree height computation when
FindParent() returns false, which it does for root items.
Now the computation is simple: The subTreeHeight is the height
of the row itself, if a) the row doesn't have a parent or b)
the parent is visible and expanded. Then if the row being removed
is expanded, we calculate the sub-tree height recursively.
Removed a lot of duplicated or even trippled checks along the
way and solved two easily solvable TODOs with regards to what is
invalidated. Previously the entire list view was invalidated
for each row being removed, even if they were scrolled out the
view bounds.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38372 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2010-08-26 13:10:27 +00:00
parent c1b432af8e
commit 2f368a273a
1 changed files with 36 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/ColumnListView.cpp
+36 -29
View File
@@ -4042,42 +4042,49 @@ OutlineView::RemoveRow(BRow* row)
BRow* parentRow;
bool parentIsVisible;
float subTreeHeight = row->Height();
if (FindParent(row, &parentRow, &parentIsVisible)) {
// adjust height
if (parentIsVisible && (parentRow == 0 || parentRow->fIsExpanded)) {
if (row->fIsExpanded) {
for (RecursiveOutlineIterator iterator(row->fChildList);
iterator.CurrentRow(); iterator.GoToNext())
subTreeHeight += iterator.CurrentRow()->Height();
}
FindParent(row, &parentRow, &parentIsVisible);
// NOTE: This could be a root row without a parent, in which case
// it is always visible, though.
// Adjust height for the visible sub-tree that is going to be removed.
float subTreeHeight = 0.0f;
if (parentIsVisible && (parentRow == NULL || parentRow->fIsExpanded)) {
// The row itself is visible at least.
subTreeHeight = row->Height() + 1;
if (row->fIsExpanded) {
// Adjust for the height of visible sub-items as well.
// (By default, the iterator follows open branches only.)
for (RecursiveOutlineIterator iterator(row->fChildList);
iterator.CurrentRow(); iterator.GoToNext())
subTreeHeight += iterator.CurrentRow()->Height() + 1;
}
BRect invalid;
if (FindRect(row, &invalid)) {
invalid.bottom = Bounds().bottom;
if (invalid.IsValid())
Invalidate(invalid);
}
}
if (parentRow != NULL) {
if (parentRow->fIsExpanded)
fItemsHeight -= subTreeHeight + 1;
} else {
fItemsHeight -= subTreeHeight + 1;
}
fItemsHeight -= subTreeHeight;
FixScrollBar(false);
if (parentRow)
if (parentRow != NULL) {
parentRow->fChildList->RemoveItem(row);
else
if (parentRow->fChildList->CountItems() == 0) {
delete parentRow->fChildList;
parentRow->fChildList = 0;
// It was the last child row of the parent, which also means the
// latch disappears.
BRect parentRowRect;
if (parentIsVisible && FindRect(parentRow, &parentRowRect))
Invalidate(parentRowRect);
}
} else
fRows.RemoveItem(row);
if (parentRow != 0 && parentRow->fChildList->CountItems() == 0) {
delete parentRow->fChildList;
parentRow->fChildList = 0;
if (parentIsVisible)
Invalidate(); // xxx crude way of redrawing latch
}
if (parentIsVisible && (parentRow == 0 || parentRow->fIsExpanded))
Invalidate(); // xxx make me smarter.
// Adjust focus row if necessary.
if (fFocusRow && FindRect(fFocusRow, &fFocusRowRect) == false) {
if (fFocusRow && !FindRect(fFocusRow, &fFocusRowRect)) {
// focus row is in a subtree that is gone, move it up to the parent.
fFocusRow = parentRow;
if (fFocusRow)