diff -r 6b0a5f4923d3 -r cf634bbf9e04 branchitem.cpp --- a/branchitem.cpp Thu Sep 17 09:41:09 2009 +0000 +++ b/branchitem.cpp Wed Sep 23 11:59:54 2009 +0000 @@ -236,21 +236,22 @@ // find out, if we are scrolled at all. // But ignore myself, just look at parents. - //cout << "BI::hasScrolledParent this="<isBranchLikeType() ) + if (bi && bi!=rootItem ) return bi->hasScrolledParent(start); else return false; } -void BranchItem::tmpUnscroll() +bool BranchItem::tmpUnscroll() { + bool result=false; + // Unscroll parent (recursivly) BranchItem * pi=(BranchItem*)parentItem; - if (pi && pi->isBranchLikeType() ) pi->tmpUnscroll(); + if (pi && pi->isBranchLikeType() ) result=pi->tmpUnscroll(); // Unscroll myself if (scrolled) @@ -259,14 +260,18 @@ systemFlags.activate("system-tmpUnscrolledRight"); toggleScroll(); model->emitDataHasChanged (this); + result=true; } + return result; } -void BranchItem::resetTmpUnscroll() +bool BranchItem::resetTmpUnscroll() { + bool result=false; + // Unscroll parent (recursivly) BranchItem * pi=(BranchItem*)parentItem; - if (pi && pi->isBranchLikeType() ) pi->resetTmpUnscroll(); + if (pi && pi->isBranchLikeType() ) result=pi->resetTmpUnscroll(); // Unscroll myself if (tmpUnscrolled) @@ -275,7 +280,9 @@ systemFlags.deactivate("system-tmpUnscrolledRight"); toggleScroll(); model->emitDataHasChanged (this); + result=true; } + return result; } void BranchItem::sortChildren()