Fossil SCM

Fix a minor problem in graph layout for timelines that made use of the offset-merge-riser enhancement. Problem originally seen on the bottom node of [/timeline?p=6da255034b30b4b4&bt=47362306a7dd7c6f].

drh 2024-04-19 16:08 trunk
Commit 33fe72ca75bbd9d50c6651ad1d9c848349df6371cbd931e10d6ec9d5dc011d5c
1 file changed +1 -1
+1 -1
--- src/graph.c
+++ src/graph.c
@@ -930,11 +930,11 @@
930930
/* Find the "root" of the branch. The root is a different branch
931931
** from which the pRow branch emerges. There might not be a root
932932
** if the pRow branch started off the bottom of the screen.
933933
*/
934934
for(pRoot=pBottom->pNext; pRoot; pRoot=pRoot->pNext){
935
- if( pRoot->aiRiser[iFrom]>=0 ) break;
935
+ if( pRoot->aiRiser[iFrom]==pBottom->idx ) break;
936936
}
937937
if( pRoot && pRoot->iRail==iTo ){
938938
/* The parent branch from which this branch emerges is on the
939939
** same rail as pRow. Do not shift as that would stack a child
940940
** branch directly above its parent. */
941941
--- src/graph.c
+++ src/graph.c
@@ -930,11 +930,11 @@
930 /* Find the "root" of the branch. The root is a different branch
931 ** from which the pRow branch emerges. There might not be a root
932 ** if the pRow branch started off the bottom of the screen.
933 */
934 for(pRoot=pBottom->pNext; pRoot; pRoot=pRoot->pNext){
935 if( pRoot->aiRiser[iFrom]>=0 ) break;
936 }
937 if( pRoot && pRoot->iRail==iTo ){
938 /* The parent branch from which this branch emerges is on the
939 ** same rail as pRow. Do not shift as that would stack a child
940 ** branch directly above its parent. */
941
--- src/graph.c
+++ src/graph.c
@@ -930,11 +930,11 @@
930 /* Find the "root" of the branch. The root is a different branch
931 ** from which the pRow branch emerges. There might not be a root
932 ** if the pRow branch started off the bottom of the screen.
933 */
934 for(pRoot=pBottom->pNext; pRoot; pRoot=pRoot->pNext){
935 if( pRoot->aiRiser[iFrom]==pBottom->idx ) break;
936 }
937 if( pRoot && pRoot->iRail==iTo ){
938 /* The parent branch from which this branch emerges is on the
939 ** same rail as pRow. Do not shift as that would stack a child
940 ** branch directly above its parent. */
941

Keyboard Shortcuts

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