Fossil SCM
Improvements to rail selection in the graph layout.
Commit
aa43709aa9f8cb78c7902e4e69c645df15eab22167d3d5ef84f33dd10b26fd00
Parent
9978f8120d422d0…
1 file changed
+2
-1
+2
-1
| --- src/graph.c | ||
| +++ src/graph.c | ||
| @@ -606,11 +606,12 @@ | ||
| 606 | 606 | continue; |
| 607 | 607 | } |
| 608 | 608 | if( pParent->idx>pRow->idx ){ |
| 609 | 609 | /* Common case: Child occurs after parent and is above the |
| 610 | 610 | ** parent in the timeline */ |
| 611 | - pRow->iRail = findFreeRail(p, 0, pParent->idx, pParent->iRail); | |
| 611 | + pRow->iRail = findFreeRail(p, pRow->idxTop, pParent->idx, | |
| 612 | + pParent->iRail); | |
| 612 | 613 | if( p->mxRail>=GR_MAX_RAIL ) return; |
| 613 | 614 | pParent->aiRiser[pRow->iRail] = pRow->idx; |
| 614 | 615 | }else{ |
| 615 | 616 | /* Timewarp case: Child occurs earlier in time than parent and |
| 616 | 617 | ** appears below the parent in the timeline. */ |
| 617 | 618 |
| --- src/graph.c | |
| +++ src/graph.c | |
| @@ -606,11 +606,12 @@ | |
| 606 | continue; |
| 607 | } |
| 608 | if( pParent->idx>pRow->idx ){ |
| 609 | /* Common case: Child occurs after parent and is above the |
| 610 | ** parent in the timeline */ |
| 611 | pRow->iRail = findFreeRail(p, 0, pParent->idx, pParent->iRail); |
| 612 | if( p->mxRail>=GR_MAX_RAIL ) return; |
| 613 | pParent->aiRiser[pRow->iRail] = pRow->idx; |
| 614 | }else{ |
| 615 | /* Timewarp case: Child occurs earlier in time than parent and |
| 616 | ** appears below the parent in the timeline. */ |
| 617 |
| --- src/graph.c | |
| +++ src/graph.c | |
| @@ -606,11 +606,12 @@ | |
| 606 | continue; |
| 607 | } |
| 608 | if( pParent->idx>pRow->idx ){ |
| 609 | /* Common case: Child occurs after parent and is above the |
| 610 | ** parent in the timeline */ |
| 611 | pRow->iRail = findFreeRail(p, pRow->idxTop, pParent->idx, |
| 612 | pParent->iRail); |
| 613 | if( p->mxRail>=GR_MAX_RAIL ) return; |
| 614 | pParent->aiRiser[pRow->iRail] = pRow->idx; |
| 615 | }else{ |
| 616 | /* Timewarp case: Child occurs earlier in time than parent and |
| 617 | ** appears below the parent in the timeline. */ |
| 618 |