Fossil SCM
Thinner and visually sharper arrows on the horizontal merge-in lines of the timeline graph.
Commit
a4f6e88411996e22b1aa7413b52f76ef48228f0a
Parent
9dab2e064671098…
1 file changed
+4
-8
+4
-8
| --- src/timeline.c | ||
| +++ src/timeline.c | ||
| @@ -594,13 +594,10 @@ | ||
| 594 | 594 | cgi_printf("],h:\"%s\"}%s", pRow->zUuid, pRow->pNext ? ",\n" : "];\n"); |
| 595 | 595 | } |
| 596 | 596 | cgi_printf("var nrail = %d\n", pGraph->mxRail+1); |
| 597 | 597 | graph_free(pGraph); |
| 598 | 598 | @ var canvasDiv = gebi("canvas"); |
| 599 | -#if 0 | |
| 600 | - @ var realCanvas = null; | |
| 601 | -#endif | |
| 602 | 599 | @ function drawBox(color,x0,y0,x1,y1){ |
| 603 | 600 | @ var n = document.createElement("div"); |
| 604 | 601 | @ if( x0>x1 ){ var t=x0; x0=x1; x1=t; } |
| 605 | 602 | @ if( y0>y1 ){ var t=y0; y0=y1; y1=t; } |
| 606 | 603 | @ var w = x1-x0+1; |
| @@ -648,16 +645,16 @@ | ||
| 648 | 645 | @ } |
| 649 | 646 | @ } |
| 650 | 647 | @ function drawThinArrow(y,xFrom,xTo){ |
| 651 | 648 | @ if( xFrom<xTo ){ |
| 652 | 649 | @ drawBox("black",xFrom,y,xTo,y); |
| 653 | - @ drawBox("black",xTo-4,y-1,xTo-2,y+1); | |
| 654 | - @ if( xTo>xFrom-8 ) drawBox("black",xTo-6,y-2,xTo-5,y+2); | |
| 650 | + @ drawBox("black",xTo-3,y-1,xTo-2,y+1); | |
| 651 | + @ drawBox("black",xTo-4,y-2,xTo-4,y+2); | |
| 655 | 652 | @ }else{ |
| 656 | 653 | @ drawBox("black",xTo,y,xFrom,y); |
| 657 | - @ drawBox("black",xTo+2,y-1,xTo+4,y+1); | |
| 658 | - @ if( xTo+8<xFrom ) drawBox("black",xTo+5,y-2,xTo+6,y+2); | |
| 654 | + @ drawBox("black",xTo+2,y-1,xTo+3,y+1); | |
| 655 | + @ drawBox("black",xTo+4,y-2,xTo+4,y+2); | |
| 659 | 656 | @ } |
| 660 | 657 | @ } |
| 661 | 658 | @ function drawThinLine(x0,y0,x1,y1){ |
| 662 | 659 | @ drawBox("black",x0,y0,x1,y1); |
| 663 | 660 | @ } |
| @@ -722,11 +719,10 @@ | ||
| 722 | 719 | @ while( canvasDiv.hasChildNodes() ){ |
| 723 | 720 | @ canvasDiv.removeChild(canvasDiv.firstChild); |
| 724 | 721 | @ } |
| 725 | 722 | @ var canvasY = absoluteY("timelineTable"); |
| 726 | 723 | @ var left = absoluteX("m"+rowinfo[0].id) - absoluteX("canvas") + 15; |
| 727 | - @ var width = nrail*railPitch; | |
| 728 | 724 | @ for(var i in rowinfo){ |
| 729 | 725 | @ rowinfo[i].y = absoluteY("m"+rowinfo[i].id) + 10 - canvasY; |
| 730 | 726 | @ rowinfo[i].x = left + rowinfo[i].r*railPitch; |
| 731 | 727 | @ } |
| 732 | 728 | @ var btm = absoluteY("grbtm") + 10 - canvasY; |
| 733 | 729 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -594,13 +594,10 @@ | |
| 594 | cgi_printf("],h:\"%s\"}%s", pRow->zUuid, pRow->pNext ? ",\n" : "];\n"); |
| 595 | } |
| 596 | cgi_printf("var nrail = %d\n", pGraph->mxRail+1); |
| 597 | graph_free(pGraph); |
| 598 | @ var canvasDiv = gebi("canvas"); |
| 599 | #if 0 |
| 600 | @ var realCanvas = null; |
| 601 | #endif |
| 602 | @ function drawBox(color,x0,y0,x1,y1){ |
| 603 | @ var n = document.createElement("div"); |
| 604 | @ if( x0>x1 ){ var t=x0; x0=x1; x1=t; } |
| 605 | @ if( y0>y1 ){ var t=y0; y0=y1; y1=t; } |
| 606 | @ var w = x1-x0+1; |
| @@ -648,16 +645,16 @@ | |
| 648 | @ } |
| 649 | @ } |
| 650 | @ function drawThinArrow(y,xFrom,xTo){ |
| 651 | @ if( xFrom<xTo ){ |
| 652 | @ drawBox("black",xFrom,y,xTo,y); |
| 653 | @ drawBox("black",xTo-4,y-1,xTo-2,y+1); |
| 654 | @ if( xTo>xFrom-8 ) drawBox("black",xTo-6,y-2,xTo-5,y+2); |
| 655 | @ }else{ |
| 656 | @ drawBox("black",xTo,y,xFrom,y); |
| 657 | @ drawBox("black",xTo+2,y-1,xTo+4,y+1); |
| 658 | @ if( xTo+8<xFrom ) drawBox("black",xTo+5,y-2,xTo+6,y+2); |
| 659 | @ } |
| 660 | @ } |
| 661 | @ function drawThinLine(x0,y0,x1,y1){ |
| 662 | @ drawBox("black",x0,y0,x1,y1); |
| 663 | @ } |
| @@ -722,11 +719,10 @@ | |
| 722 | @ while( canvasDiv.hasChildNodes() ){ |
| 723 | @ canvasDiv.removeChild(canvasDiv.firstChild); |
| 724 | @ } |
| 725 | @ var canvasY = absoluteY("timelineTable"); |
| 726 | @ var left = absoluteX("m"+rowinfo[0].id) - absoluteX("canvas") + 15; |
| 727 | @ var width = nrail*railPitch; |
| 728 | @ for(var i in rowinfo){ |
| 729 | @ rowinfo[i].y = absoluteY("m"+rowinfo[i].id) + 10 - canvasY; |
| 730 | @ rowinfo[i].x = left + rowinfo[i].r*railPitch; |
| 731 | @ } |
| 732 | @ var btm = absoluteY("grbtm") + 10 - canvasY; |
| 733 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -594,13 +594,10 @@ | |
| 594 | cgi_printf("],h:\"%s\"}%s", pRow->zUuid, pRow->pNext ? ",\n" : "];\n"); |
| 595 | } |
| 596 | cgi_printf("var nrail = %d\n", pGraph->mxRail+1); |
| 597 | graph_free(pGraph); |
| 598 | @ var canvasDiv = gebi("canvas"); |
| 599 | @ function drawBox(color,x0,y0,x1,y1){ |
| 600 | @ var n = document.createElement("div"); |
| 601 | @ if( x0>x1 ){ var t=x0; x0=x1; x1=t; } |
| 602 | @ if( y0>y1 ){ var t=y0; y0=y1; y1=t; } |
| 603 | @ var w = x1-x0+1; |
| @@ -648,16 +645,16 @@ | |
| 645 | @ } |
| 646 | @ } |
| 647 | @ function drawThinArrow(y,xFrom,xTo){ |
| 648 | @ if( xFrom<xTo ){ |
| 649 | @ drawBox("black",xFrom,y,xTo,y); |
| 650 | @ drawBox("black",xTo-3,y-1,xTo-2,y+1); |
| 651 | @ drawBox("black",xTo-4,y-2,xTo-4,y+2); |
| 652 | @ }else{ |
| 653 | @ drawBox("black",xTo,y,xFrom,y); |
| 654 | @ drawBox("black",xTo+2,y-1,xTo+3,y+1); |
| 655 | @ drawBox("black",xTo+4,y-2,xTo+4,y+2); |
| 656 | @ } |
| 657 | @ } |
| 658 | @ function drawThinLine(x0,y0,x1,y1){ |
| 659 | @ drawBox("black",x0,y0,x1,y1); |
| 660 | @ } |
| @@ -722,11 +719,10 @@ | |
| 719 | @ while( canvasDiv.hasChildNodes() ){ |
| 720 | @ canvasDiv.removeChild(canvasDiv.firstChild); |
| 721 | @ } |
| 722 | @ var canvasY = absoluteY("timelineTable"); |
| 723 | @ var left = absoluteX("m"+rowinfo[0].id) - absoluteX("canvas") + 15; |
| 724 | @ for(var i in rowinfo){ |
| 725 | @ rowinfo[i].y = absoluteY("m"+rowinfo[i].id) + 10 - canvasY; |
| 726 | @ rowinfo[i].x = left + rowinfo[i].r*railPitch; |
| 727 | @ } |
| 728 | @ var btm = absoluteY("grbtm") + 10 - canvasY; |
| 729 |