Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Fix the display of cherrypick links that are on the same rail as their origin node but then go left. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
632d07c6a90810c2b2861b09707cab5c |
User & Date: | drh 2022-03-07 21:12:32 |
Context
2022-03-08
| ||
01:07 | Timeline graph layout changes that strive to do better a communicating the merging and branching activity between multiple branches. ... (check-in: d1d7fce6 user: drh tags: trunk) | |
2022-03-07
| ||
21:12 | Fix the display of cherrypick links that are on the same rail as their origin node but then go left. ... (check-in: 632d07c6 user: drh tags: trunk) | |
21:01 | Fix very minor comment typos. ... (check-in: 680837fa user: drh tags: trunk) | |
Changes
Changes to src/graph.js.
︙ | ︙ | |||
420 421 422 423 424 425 426 427 428 429 | } } } if( p.hasOwnProperty('mo') ){ var x0 = p.x + node.w/2; var x1 = p.mo*railPitch + node.w/2; var u = tx.rowinfo[p.mu-tx.iTopRow]; var y1 = miLineY(u); if( p.u<=0 || p.mo!=p.r ){ if( p.u==0 && p.mo==p.r ){ | > > > > | | 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 | } } } if( p.hasOwnProperty('mo') ){ var x0 = p.x + node.w/2; var x1 = p.mo*railPitch + node.w/2; var u = tx.rowinfo[p.mu-tx.iTopRow]; var mtop = u; if( p.hasOwnProperty('cu') ){ mtop = tx.rowinfo[p.cu-tx.iTopRow]; } var y1 = miLineY(u); if( p.u<=0 || p.mo!=p.r ){ if( p.u==0 && p.mo==p.r ){ mergeLines[p.mo] = mtop.r<p.r ? -mergeOffset-mLine.w : mergeOffset; }else{ mergeLines[p.mo] = -mLine.w/2; } x1 += mergeLines[p.mo] var y0 = p.y+2; var isCP = p.hasOwnProperty('cu'); if( p.mu==p.id ){ |
︙ | ︙ | |||
456 457 458 459 460 461 462 | } if( isCP && p.cu!=p.id ){ var u2 = tx.rowinfo[p.cu-tx.iTopRow]; var y2 = miLineY(u2); drawCherrypickLine(x1,y1,null,y2); } }else if( mergeOffset ){ | | | 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 | } if( isCP && p.cu!=p.id ){ var u2 = tx.rowinfo[p.cu-tx.iTopRow]; var y2 = miLineY(u2); drawCherrypickLine(x1,y1,null,y2); } }else if( mergeOffset ){ mergeLines[p.mo] = mtop.r<p.r ? -mergeOffset-mLine.w : mergeOffset; x1 += mergeLines[p.mo]; if( p.mu<p.id ){ drawMergeLine(x1,p.y+node.h/2,null,y1); } if( p.hasOwnProperty('cu') ){ var u2 = tx.rowinfo[p.cu-tx.iTopRow]; var y2 = miLineY(u2); |
︙ | ︙ |