Fossil SCM
A merge riser is allowed to ride along side a riser to an off-screen node.
Commit
52ea66df56e3ddf88afadce4e475a576758afa81
Parent
d7a0240f3963be2…
1 file changed
+1
-1
+1
-1
| --- src/graph.c | ||
| +++ src/graph.c | ||
| @@ -273,11 +273,11 @@ | ||
| 273 | 273 | u32 mask; |
| 274 | 274 | GraphRow *pLoop; |
| 275 | 275 | |
| 276 | 276 | if( pParent->mergeOut<0 ){ |
| 277 | 277 | u = pParent->aiRiser[pParent->iRail]; |
| 278 | - if( u>0 && u<pChild->idx ){ | |
| 278 | + if( u>=0 && u<pChild->idx ){ | |
| 279 | 279 | /* The thick arrow up to the next primary child of pDesc goes |
| 280 | 280 | ** further up than the thin merge arrow riser, so draw them both |
| 281 | 281 | ** on the same rail. */ |
| 282 | 282 | pParent->mergeOut = pParent->iRail*4; |
| 283 | 283 | if( pParent->iRail<pChild->iRail ) pParent->mergeOut += 2; |
| 284 | 284 |
| --- src/graph.c | |
| +++ src/graph.c | |
| @@ -273,11 +273,11 @@ | |
| 273 | u32 mask; |
| 274 | GraphRow *pLoop; |
| 275 | |
| 276 | if( pParent->mergeOut<0 ){ |
| 277 | u = pParent->aiRiser[pParent->iRail]; |
| 278 | if( u>0 && u<pChild->idx ){ |
| 279 | /* The thick arrow up to the next primary child of pDesc goes |
| 280 | ** further up than the thin merge arrow riser, so draw them both |
| 281 | ** on the same rail. */ |
| 282 | pParent->mergeOut = pParent->iRail*4; |
| 283 | if( pParent->iRail<pChild->iRail ) pParent->mergeOut += 2; |
| 284 |
| --- src/graph.c | |
| +++ src/graph.c | |
| @@ -273,11 +273,11 @@ | |
| 273 | u32 mask; |
| 274 | GraphRow *pLoop; |
| 275 | |
| 276 | if( pParent->mergeOut<0 ){ |
| 277 | u = pParent->aiRiser[pParent->iRail]; |
| 278 | if( u>=0 && u<pChild->idx ){ |
| 279 | /* The thick arrow up to the next primary child of pDesc goes |
| 280 | ** further up than the thin merge arrow riser, so draw them both |
| 281 | ** on the same rail. */ |
| 282 | pParent->mergeOut = pParent->iRail*4; |
| 283 | if( pParent->iRail<pChild->iRail ) pParent->mergeOut += 2; |
| 284 |