Fossil SCM

Add anti-aliasing to timewarp arrowheads. Improve the anti-aliasing on merge arrowheads.

drh 2015-03-10 18:46 trunk
Commit f99848e04832e6b7d2ccdc85e1bd820fd4143721
1 file changed +20 -3
+20 -3
--- src/timeline.c
+++ src/timeline.c
@@ -790,15 +790,17 @@
790790
@ n.style.borderTopWidth = "2px";
791791
@ n.style.borderBottomWidth = "2px";
792792
@ if( xFrom<xTo ){
793793
@ drawBox(lineClr,xFrom,y,xTo-3,y);
794794
@ n.style.left = xTo-3+"px";
795
+ @ n.style.borderLeftStyle = "inset";
795796
@ n.style.borderLeftWidth = "3px";
796797
@ n.style.borderLeftColor = "#000";
797798
@ }else{
798799
@ drawBox(lineClr,xTo+3,y,xFrom,y);
799800
@ n.style.left = xTo+1+"px";
801
+ @ n.style.borderRightStyle = "outset";
800802
@ n.style.borderRightWidth = "3px";
801803
@ n.style.borderRightColor = "#000";
802804
@ }
803805
@ cDiv.appendChild(n);
804806
@ }
@@ -840,13 +842,28 @@
840842
@ drawBox(lineClr,x0,p.y,x1+1,p.y+1);
841843
@ drawUpArrow(x1, u.y+6, p.y);
842844
@ }else{
843845
@ drawBox("#600000",x0,p.y,x1,p.y+1);
844846
@ drawBox("#600000",x1-1,p.y,x1,u.y+1);
845
- @ drawBox("#600000",x1,u.y,u.x-6,u.y+1);
846
- @ drawBox("#600000",u.x-9,u.y-1,u.x-8,u.y+2);
847
- @ drawBox("#600000",u.x-11,u.y-2,u.x-10,u.y+3);
847
+ @ drawBox("#600000",x1,u.y,u.x-10,u.y+1);
848
+ @ var n = document.createElement("div"),
849
+ @ t = u.y-2,
850
+ @ l = u.x-11;
851
+ @ n.style.position = "absolute";
852
+ @ n.style.top = t+"px";
853
+ @ n.style.left = l+"px";
854
+ @ n.style.width = 0;
855
+ @ n.style.height = 0;
856
+ @ n.style.borderWidth = 0;
857
+ @ n.style.borderStyle = "solid";
858
+ @ n.style.borderColor = "transparent";
859
+ @ n.style.borderTopWidth = "3px";
860
+ @ n.style.borderBottomWidth = "3px";
861
+ @ n.style.borderLeftStyle = "inset";
862
+ @ n.style.borderLeftWidth = "7px";
863
+ @ n.style.borderLeftColor = "#600000";
864
+ @ cDiv.appendChild(n);
848865
@ }
849866
@ }
850867
@ for(var j in p.mi){
851868
@ var y0 = p.y+5;
852869
@ var mx = p.mi[j];
853870
--- src/timeline.c
+++ src/timeline.c
@@ -790,15 +790,17 @@
790 @ n.style.borderTopWidth = "2px";
791 @ n.style.borderBottomWidth = "2px";
792 @ if( xFrom<xTo ){
793 @ drawBox(lineClr,xFrom,y,xTo-3,y);
794 @ n.style.left = xTo-3+"px";
 
795 @ n.style.borderLeftWidth = "3px";
796 @ n.style.borderLeftColor = "#000";
797 @ }else{
798 @ drawBox(lineClr,xTo+3,y,xFrom,y);
799 @ n.style.left = xTo+1+"px";
 
800 @ n.style.borderRightWidth = "3px";
801 @ n.style.borderRightColor = "#000";
802 @ }
803 @ cDiv.appendChild(n);
804 @ }
@@ -840,13 +842,28 @@
840 @ drawBox(lineClr,x0,p.y,x1+1,p.y+1);
841 @ drawUpArrow(x1, u.y+6, p.y);
842 @ }else{
843 @ drawBox("#600000",x0,p.y,x1,p.y+1);
844 @ drawBox("#600000",x1-1,p.y,x1,u.y+1);
845 @ drawBox("#600000",x1,u.y,u.x-6,u.y+1);
846 @ drawBox("#600000",u.x-9,u.y-1,u.x-8,u.y+2);
847 @ drawBox("#600000",u.x-11,u.y-2,u.x-10,u.y+3);
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
848 @ }
849 @ }
850 @ for(var j in p.mi){
851 @ var y0 = p.y+5;
852 @ var mx = p.mi[j];
853
--- src/timeline.c
+++ src/timeline.c
@@ -790,15 +790,17 @@
790 @ n.style.borderTopWidth = "2px";
791 @ n.style.borderBottomWidth = "2px";
792 @ if( xFrom<xTo ){
793 @ drawBox(lineClr,xFrom,y,xTo-3,y);
794 @ n.style.left = xTo-3+"px";
795 @ n.style.borderLeftStyle = "inset";
796 @ n.style.borderLeftWidth = "3px";
797 @ n.style.borderLeftColor = "#000";
798 @ }else{
799 @ drawBox(lineClr,xTo+3,y,xFrom,y);
800 @ n.style.left = xTo+1+"px";
801 @ n.style.borderRightStyle = "outset";
802 @ n.style.borderRightWidth = "3px";
803 @ n.style.borderRightColor = "#000";
804 @ }
805 @ cDiv.appendChild(n);
806 @ }
@@ -840,13 +842,28 @@
842 @ drawBox(lineClr,x0,p.y,x1+1,p.y+1);
843 @ drawUpArrow(x1, u.y+6, p.y);
844 @ }else{
845 @ drawBox("#600000",x0,p.y,x1,p.y+1);
846 @ drawBox("#600000",x1-1,p.y,x1,u.y+1);
847 @ drawBox("#600000",x1,u.y,u.x-10,u.y+1);
848 @ var n = document.createElement("div"),
849 @ t = u.y-2,
850 @ l = u.x-11;
851 @ n.style.position = "absolute";
852 @ n.style.top = t+"px";
853 @ n.style.left = l+"px";
854 @ n.style.width = 0;
855 @ n.style.height = 0;
856 @ n.style.borderWidth = 0;
857 @ n.style.borderStyle = "solid";
858 @ n.style.borderColor = "transparent";
859 @ n.style.borderTopWidth = "3px";
860 @ n.style.borderBottomWidth = "3px";
861 @ n.style.borderLeftStyle = "inset";
862 @ n.style.borderLeftWidth = "7px";
863 @ n.style.borderLeftColor = "#600000";
864 @ cDiv.appendChild(n);
865 @ }
866 @ }
867 @ for(var j in p.mi){
868 @ var y0 = p.y+5;
869 @ var mx = p.mi[j];
870

Keyboard Shortcuts

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