Fossil SCM
Differentiate merge check-ins from regular, linear check-ins
Commit
9d39c6dca7be2796f9a2ede9ab1f5e1a98a09d3b
Parent
f215075a47e34aa…
1 file changed
+9
-5
+9
-5
| --- src/timeline.c | ||
| +++ src/timeline.c | ||
| @@ -804,18 +804,21 @@ | ||
| 804 | 804 | @ cDiv.appendChild(n); |
| 805 | 805 | @ } |
| 806 | 806 | @ function drawThinLine(x0,y0,x1,y1){ |
| 807 | 807 | @ drawBox(lineClr,x0,y0,x1,y1); |
| 808 | 808 | @ } |
| 809 | - @ function drawNodeBox(color,x0,y0,x1,y1){ | |
| 810 | - @ drawBox(color,x0,y0,x1,y1).style.cursor = "pointer"; | |
| 809 | + @ function drawNodeBox(color,x0,y0,x1,y1,isMerge){ | |
| 810 | + @ var n = drawBox(color,x0,y0,x1,y1); | |
| 811 | + @ n.style.cursor = "pointer"; | |
| 812 | + @ if ( !isMerge ) n.style.borderRadius = "6px"; | |
| 811 | 813 | @ } |
| 812 | 814 | @ function drawNode(p, left, btm){ |
| 813 | - @ drawNodeBox(boxColor,p.x-5,p.y-5,p.x+6,p.y+6); | |
| 814 | - @ drawNodeBox(p.bg||bgClr,p.x-4,p.y-4,p.x+5,p.y+5); | |
| 815 | + @ var isMerge = p.mi.length>0; | |
| 816 | + @ drawNodeBox(boxColor,p.x-5,p.y-5,p.x+6,p.y+6,isMerge); | |
| 817 | + @ drawNodeBox(p.bg||bgClr,p.x-4,p.y-4,p.x+5,p.y+5,isMerge); | |
| 815 | 818 | @ if( p.u>0 ) drawUpArrow(p.x, rowinfo[p.u-1].y+6, p.y-5); |
| 816 | - @ if( p.f&1 ) drawNodeBox(boxColor,p.x-1,p.y-1,p.x+2,p.y+2); | |
| 819 | + @ if( p.f&1 ) drawNodeBox(boxColor,p.x-1,p.y-1,p.x+2,p.y+2,isMerge); | |
| 817 | 820 | if( !omitDescenders ){ |
| 818 | 821 | @ if( p.u==0 ) drawUpArrow(p.x, 0, p.y-5); |
| 819 | 822 | @ if( p.d ) drawUpArrow(p.x, p.y+6, btm); |
| 820 | 823 | } |
| 821 | 824 | @ if( p.mo>0 ){ |
| @@ -924,10 +927,11 @@ | ||
| 924 | 927 | @ } |
| 925 | 928 | @ } |
| 926 | 929 | @ function clickOnRow(p){ |
| 927 | 930 | @ if( selRow==null ){ |
| 928 | 931 | @ selBox = drawBox("red",p.x-2,p.y-2,p.x+3,p.y+3); |
| 932 | + @ if ( p.mi.length==0 ) selBox.style.borderRadius="6px"; | |
| 929 | 933 | @ selRow = p; |
| 930 | 934 | @ }else if( selRow==p ){ |
| 931 | 935 | @ var canvasDiv = gebi("canvas"); |
| 932 | 936 | @ canvasDiv.removeChild(selBox); |
| 933 | 937 | @ selBox = null; |
| 934 | 938 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -804,18 +804,21 @@ | |
| 804 | @ cDiv.appendChild(n); |
| 805 | @ } |
| 806 | @ function drawThinLine(x0,y0,x1,y1){ |
| 807 | @ drawBox(lineClr,x0,y0,x1,y1); |
| 808 | @ } |
| 809 | @ function drawNodeBox(color,x0,y0,x1,y1){ |
| 810 | @ drawBox(color,x0,y0,x1,y1).style.cursor = "pointer"; |
| 811 | @ } |
| 812 | @ function drawNode(p, left, btm){ |
| 813 | @ drawNodeBox(boxColor,p.x-5,p.y-5,p.x+6,p.y+6); |
| 814 | @ drawNodeBox(p.bg||bgClr,p.x-4,p.y-4,p.x+5,p.y+5); |
| 815 | @ if( p.u>0 ) drawUpArrow(p.x, rowinfo[p.u-1].y+6, p.y-5); |
| 816 | @ if( p.f&1 ) drawNodeBox(boxColor,p.x-1,p.y-1,p.x+2,p.y+2); |
| 817 | if( !omitDescenders ){ |
| 818 | @ if( p.u==0 ) drawUpArrow(p.x, 0, p.y-5); |
| 819 | @ if( p.d ) drawUpArrow(p.x, p.y+6, btm); |
| 820 | } |
| 821 | @ if( p.mo>0 ){ |
| @@ -924,10 +927,11 @@ | |
| 924 | @ } |
| 925 | @ } |
| 926 | @ function clickOnRow(p){ |
| 927 | @ if( selRow==null ){ |
| 928 | @ selBox = drawBox("red",p.x-2,p.y-2,p.x+3,p.y+3); |
| 929 | @ selRow = p; |
| 930 | @ }else if( selRow==p ){ |
| 931 | @ var canvasDiv = gebi("canvas"); |
| 932 | @ canvasDiv.removeChild(selBox); |
| 933 | @ selBox = null; |
| 934 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -804,18 +804,21 @@ | |
| 804 | @ cDiv.appendChild(n); |
| 805 | @ } |
| 806 | @ function drawThinLine(x0,y0,x1,y1){ |
| 807 | @ drawBox(lineClr,x0,y0,x1,y1); |
| 808 | @ } |
| 809 | @ function drawNodeBox(color,x0,y0,x1,y1,isMerge){ |
| 810 | @ var n = drawBox(color,x0,y0,x1,y1); |
| 811 | @ n.style.cursor = "pointer"; |
| 812 | @ if ( !isMerge ) n.style.borderRadius = "6px"; |
| 813 | @ } |
| 814 | @ function drawNode(p, left, btm){ |
| 815 | @ var isMerge = p.mi.length>0; |
| 816 | @ drawNodeBox(boxColor,p.x-5,p.y-5,p.x+6,p.y+6,isMerge); |
| 817 | @ drawNodeBox(p.bg||bgClr,p.x-4,p.y-4,p.x+5,p.y+5,isMerge); |
| 818 | @ if( p.u>0 ) drawUpArrow(p.x, rowinfo[p.u-1].y+6, p.y-5); |
| 819 | @ if( p.f&1 ) drawNodeBox(boxColor,p.x-1,p.y-1,p.x+2,p.y+2,isMerge); |
| 820 | if( !omitDescenders ){ |
| 821 | @ if( p.u==0 ) drawUpArrow(p.x, 0, p.y-5); |
| 822 | @ if( p.d ) drawUpArrow(p.x, p.y+6, btm); |
| 823 | } |
| 824 | @ if( p.mo>0 ){ |
| @@ -924,10 +927,11 @@ | |
| 927 | @ } |
| 928 | @ } |
| 929 | @ function clickOnRow(p){ |
| 930 | @ if( selRow==null ){ |
| 931 | @ selBox = drawBox("red",p.x-2,p.y-2,p.x+3,p.y+3); |
| 932 | @ if ( p.mi.length==0 ) selBox.style.borderRadius="6px"; |
| 933 | @ selRow = p; |
| 934 | @ }else if( selRow==p ){ |
| 935 | @ var canvasDiv = gebi("canvas"); |
| 936 | @ canvasDiv.removeChild(selBox); |
| 937 | @ selBox = null; |
| 938 |