1.1 --- a/branchitem.cpp Thu Sep 17 09:41:09 2009 +0000
1.2 +++ b/branchitem.cpp Wed Sep 23 11:59:54 2009 +0000
1.3 @@ -236,21 +236,22 @@
1.4 // find out, if we are scrolled at all.
1.5 // But ignore myself, just look at parents.
1.6
1.7 - //cout << "BI::hasScrolledParent this="<<this<<" "<<getHeadingStd()<<endl;
1.8 if (this !=start && scrolled) return true;
1.9
1.10 BranchItem* bi=(BranchItem*)parentItem;
1.11 - if (bi && bi!=rootItem && bi->isBranchLikeType() )
1.12 + if (bi && bi!=rootItem )
1.13 return bi->hasScrolledParent(start);
1.14 else
1.15 return false;
1.16 }
1.17
1.18 -void BranchItem::tmpUnscroll()
1.19 +bool BranchItem::tmpUnscroll()
1.20 {
1.21 + bool result=false;
1.22 +
1.23 // Unscroll parent (recursivly)
1.24 BranchItem * pi=(BranchItem*)parentItem;
1.25 - if (pi && pi->isBranchLikeType() ) pi->tmpUnscroll();
1.26 + if (pi && pi->isBranchLikeType() ) result=pi->tmpUnscroll();
1.27
1.28 // Unscroll myself
1.29 if (scrolled)
1.30 @@ -259,14 +260,18 @@
1.31 systemFlags.activate("system-tmpUnscrolledRight");
1.32 toggleScroll();
1.33 model->emitDataHasChanged (this);
1.34 + result=true;
1.35 }
1.36 + return result;
1.37 }
1.38
1.39 -void BranchItem::resetTmpUnscroll()
1.40 +bool BranchItem::resetTmpUnscroll()
1.41 {
1.42 + bool result=false;
1.43 +
1.44 // Unscroll parent (recursivly)
1.45 BranchItem * pi=(BranchItem*)parentItem;
1.46 - if (pi && pi->isBranchLikeType() ) pi->resetTmpUnscroll();
1.47 + if (pi && pi->isBranchLikeType() ) result=pi->resetTmpUnscroll();
1.48
1.49 // Unscroll myself
1.50 if (tmpUnscrolled)
1.51 @@ -275,7 +280,9 @@
1.52 systemFlags.deactivate("system-tmpUnscrolledRight");
1.53 toggleScroll();
1.54 model->emitDataHasChanged (this);
1.55 + result=true;
1.56 }
1.57 + return result;
1.58 }
1.59
1.60 void BranchItem::sortChildren()