Fossil SCM

Graph layout: Reduce the top-margin requirement for a merge arrow that comes straight up out of the top of a leaf node.

drh 2022-03-10 12:50 trunk
Commit 6b56d89058b8c63c1b55d29e6d9c70ed99e5ce21fbb4d52dd6da3f4e73edc796
1 file changed +1 -1
+1 -1
--- src/graph.c
+++ src/graph.c
@@ -398,11 +398,11 @@
398398
u64 mask;
399399
GraphRow *pLoop;
400400
401401
if( pParent->mergeOut<0 ){
402402
u = pParent->aiRiser[pParent->iRail];
403
- if( u<0 && railIsClear(pParent->pPrev, pChild->idx-1, pParent->iRail) ){
403
+ if( u<0 && railIsClear(pParent->pPrev, pChild->idx, pParent->iRail) ){
404404
/* pParent is a leaf and the merge-line can be drawn straight up.*/
405405
pParent->mergeOut = pParent->iRail;
406406
mask = BIT(pParent->iRail);
407407
for(pLoop=pChild->pNext; pLoop && pLoop->rid!=pParent->rid;
408408
pLoop=pLoop->pNext){
409409
--- src/graph.c
+++ src/graph.c
@@ -398,11 +398,11 @@
398 u64 mask;
399 GraphRow *pLoop;
400
401 if( pParent->mergeOut<0 ){
402 u = pParent->aiRiser[pParent->iRail];
403 if( u<0 && railIsClear(pParent->pPrev, pChild->idx-1, pParent->iRail) ){
404 /* pParent is a leaf and the merge-line can be drawn straight up.*/
405 pParent->mergeOut = pParent->iRail;
406 mask = BIT(pParent->iRail);
407 for(pLoop=pChild->pNext; pLoop && pLoop->rid!=pParent->rid;
408 pLoop=pLoop->pNext){
409
--- src/graph.c
+++ src/graph.c
@@ -398,11 +398,11 @@
398 u64 mask;
399 GraphRow *pLoop;
400
401 if( pParent->mergeOut<0 ){
402 u = pParent->aiRiser[pParent->iRail];
403 if( u<0 && railIsClear(pParent->pPrev, pChild->idx, pParent->iRail) ){
404 /* pParent is a leaf and the merge-line can be drawn straight up.*/
405 pParent->mergeOut = pParent->iRail;
406 mask = BIT(pParent->iRail);
407 for(pLoop=pChild->pNext; pLoop && pLoop->rid!=pParent->rid;
408 pLoop=pLoop->pNext){
409

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button