Fossil SCM
Bug fix from previous check-in: Make sure merge risers are drawn when requested.
Commit
151717fc48f0a707f39ea17aaf5463beb8763a06
Parent
dafc3fe42aa4066…
1 file changed
+1
-1
+1
-1
| --- src/timeline.c | ||
| +++ src/timeline.c | ||
| @@ -826,11 +826,11 @@ | ||
| 826 | 826 | @ if( x1>=p.x-5 && x1<=p.x+5 ){ |
| 827 | 827 | @ y1 = p.y-5; |
| 828 | 828 | @ }else{ |
| 829 | 829 | @ drawThinLine(x0,y1,x1,y1); |
| 830 | 830 | @ } |
| 831 | - if( mergeOffset>0 ) cgi_printf("if( p.mo!=p.u-1 ) "); | |
| 831 | + if( mergeOffset==0 ) cgi_printf("if( p.mo!=p.u-1 ) "); | |
| 832 | 832 | @ drawThinLine(x1,y0,x1,y1); |
| 833 | 833 | @ } |
| 834 | 834 | @ var n = p.au.length; |
| 835 | 835 | @ for(var i=0; i<n; i+=2){ |
| 836 | 836 | @ var x1 = p.au[i]*railPitch + left; |
| 837 | 837 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -826,11 +826,11 @@ | |
| 826 | @ if( x1>=p.x-5 && x1<=p.x+5 ){ |
| 827 | @ y1 = p.y-5; |
| 828 | @ }else{ |
| 829 | @ drawThinLine(x0,y1,x1,y1); |
| 830 | @ } |
| 831 | if( mergeOffset>0 ) cgi_printf("if( p.mo!=p.u-1 ) "); |
| 832 | @ drawThinLine(x1,y0,x1,y1); |
| 833 | @ } |
| 834 | @ var n = p.au.length; |
| 835 | @ for(var i=0; i<n; i+=2){ |
| 836 | @ var x1 = p.au[i]*railPitch + left; |
| 837 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -826,11 +826,11 @@ | |
| 826 | @ if( x1>=p.x-5 && x1<=p.x+5 ){ |
| 827 | @ y1 = p.y-5; |
| 828 | @ }else{ |
| 829 | @ drawThinLine(x0,y1,x1,y1); |
| 830 | @ } |
| 831 | if( mergeOffset==0 ) cgi_printf("if( p.mo!=p.u-1 ) "); |
| 832 | @ drawThinLine(x1,y0,x1,y1); |
| 833 | @ } |
| 834 | @ var n = p.au.length; |
| 835 | @ for(var i=0; i<n; i+=2){ |
| 836 | @ var x1 = p.au[i]*railPitch + left; |
| 837 |