Fossil SCM

Fix the elipsis at the bottom of decenders so that they are the same color as the rest of the line.

drh 2019-05-16 22:35 graph-improvements
Commit 34fd632e165727f771e30adf1cb2bc47a856bfe70c791e14d32edd525cf07271
Parent d76bc40569e78f3…
2 files changed +3 -3 +5 -4
~ src/default_css.txt ~ src/graph.js
M src/default_css.txt
+3 -3
--- src/default_css.txt
+++ src/default_css.txt
@@ -189,14 +189,14 @@
189189
 border-left: 7px solid #600000;
190190
 }
191191
 .tl-line.warp {
192192
 background: #600000;
193193
 }
194
-.tl-line.dotted {
194
+.tl-line.dotted.v {
195195
 width: 0px;
196
- border-top: 0px dotted #888;
197
- border-left: 2px dotted #888;
196
+ border-left-width: 2px;
197
+ border-left-style: dotted;
198198
 background: rgba(255,255,255,0);
199199
 }
200200
 span.tagDsp {
201201
 font-weight: bold;
202202
 }
203203
--- src/default_css.txt
+++ src/default_css.txt
@@ -189,14 +189,14 @@
189 border-left: 7px solid #600000;
190 }
191 .tl-line.warp {
192 background: #600000;
193 }
194 .tl-line.dotted {
195 width: 0px;
196 border-top: 0px dotted #888;
197 border-left: 2px dotted #888;
198 background: rgba(255,255,255,0);
199 }
200 span.tagDsp {
201 font-weight: bold;
202 }
203
--- src/default_css.txt
+++ src/default_css.txt
@@ -189,14 +189,14 @@
189 border-left: 7px solid #600000;
190 }
191 .tl-line.warp {
192 background: #600000;
193 }
194 .tl-line.dotted.v {
195 width: 0px;
196 border-left-width: 2px;
197 border-left-style: dotted;
198 background: rgba(255,255,255,0);
199 }
200 span.tagDsp {
201 font-weight: bold;
202 }
203
M src/graph.js
+5 -4
--- src/graph.js
+++ src/graph.js
@@ -183,11 +183,11 @@
183183
 cls += "v";
184184
 }else{
185185
 y1 = y0+elem.w;
186186
 cls += "h";
187187
 }
188
- drawBox(cls,color,x0,y0,x1,y1);
188
+ return drawBox(cls,color,x0,y0,x1,y1);
189189
 }
190190
 function drawUpArrow(from,to,color){
191191
 var y = to.y + node.h;
192192
 var arrowSpace = from.y - y + (!from.id || from.r!=to.r ? node.h/2 : 0);
193193
 var arw = arrowSpace < arrow.h*1.5 ? arrowSmall : arrow;
@@ -201,11 +201,12 @@
201201
 }
202202
 function drawDotted(from,to,color){
203203
 var x = to.x + (node.w-line.w)/2;
204204
 var y0 = from.y + node.h/2;
205205
 var y1 = Math.ceil(to.y + node.h);
206
- drawLine(dotLine,color,x,y0,null,y1);
206
+ var n = drawLine(dotLine,null,x,y0,null,y1)
207
+ if( color ) n.style.borderColor = color
207208
 }
208209
 /* Draw thin horizontal or vertical lines representing merges */
209210
 function drawMergeLine(x0,y0,x1,y1){
210211
 drawLine(mLine,null,x0,y0,x1,y1);
211212
 }
@@ -243,11 +244,11 @@
243244
 e = document.getElementById("md"+p.id);
244245
 if(e) e.style.backgroundColor = p.bg;
245246
 }
246247
 if( p.r<0 ) return;
247248
 if( p.u>0 ) drawUpArrow(p,tx.rowinfo[p.u-tx.iTopRow],p.fg);
248
- if( p.sb>0 ) drawDotted(p,tx.rowinfo[p.sb-tx.iTopRow],null);
249
+ if( p.sb>0 ) drawDotted(p,tx.rowinfo[p.sb-tx.iTopRow],p.fg);
249250
 var cls = node.cls;
250251
 if( p.hasOwnProperty('mi') && p.mi.length ) cls += " merge";
251252
 if( p.f&1 ) cls += " leaf";
252253
 var n = drawBox(cls,p.bg,p.x,p.y);
253254
 n.id = "tln"+p.id;
@@ -267,11 +268,11 @@
267268
 if( p.hasOwnProperty('d') ){
268269
 if( p.y + 150 >= btm ){
269270
 drawUpArrow({x: p.x, y: btm - node.h/2},p,p.fg);
270271
 }else{
271272
 drawUpArrow({x: p.x, y: p.y+50},p,p.fg);
272
- drawDotted({x: p.x, y: p.y+63},{x: p.x, y: p.y+50-node.h/2},null);
273
+ drawDotted({x: p.x, y: p.y+63},{x: p.x, y: p.y+50-node.h/2},p.fg);
273274
 }
274275
 }
275276
 }
276277
 if( p.hasOwnProperty('mo') ){
277278
 var x0 = p.x + node.w/2;
278279
--- src/graph.js
+++ src/graph.js
@@ -183,11 +183,11 @@
183 cls += "v";
184 }else{
185 y1 = y0+elem.w;
186 cls += "h";
187 }
188 drawBox(cls,color,x0,y0,x1,y1);
189 }
190 function drawUpArrow(from,to,color){
191 var y = to.y + node.h;
192 var arrowSpace = from.y - y + (!from.id || from.r!=to.r ? node.h/2 : 0);
193 var arw = arrowSpace < arrow.h*1.5 ? arrowSmall : arrow;
@@ -201,11 +201,12 @@
201 }
202 function drawDotted(from,to,color){
203 var x = to.x + (node.w-line.w)/2;
204 var y0 = from.y + node.h/2;
205 var y1 = Math.ceil(to.y + node.h);
206 drawLine(dotLine,color,x,y0,null,y1);
 
207 }
208 /* Draw thin horizontal or vertical lines representing merges */
209 function drawMergeLine(x0,y0,x1,y1){
210 drawLine(mLine,null,x0,y0,x1,y1);
211 }
@@ -243,11 +244,11 @@
243 e = document.getElementById("md"+p.id);
244 if(e) e.style.backgroundColor = p.bg;
245 }
246 if( p.r<0 ) return;
247 if( p.u>0 ) drawUpArrow(p,tx.rowinfo[p.u-tx.iTopRow],p.fg);
248 if( p.sb>0 ) drawDotted(p,tx.rowinfo[p.sb-tx.iTopRow],null);
249 var cls = node.cls;
250 if( p.hasOwnProperty('mi') && p.mi.length ) cls += " merge";
251 if( p.f&1 ) cls += " leaf";
252 var n = drawBox(cls,p.bg,p.x,p.y);
253 n.id = "tln"+p.id;
@@ -267,11 +268,11 @@
267 if( p.hasOwnProperty('d') ){
268 if( p.y + 150 >= btm ){
269 drawUpArrow({x: p.x, y: btm - node.h/2},p,p.fg);
270 }else{
271 drawUpArrow({x: p.x, y: p.y+50},p,p.fg);
272 drawDotted({x: p.x, y: p.y+63},{x: p.x, y: p.y+50-node.h/2},null);
273 }
274 }
275 }
276 if( p.hasOwnProperty('mo') ){
277 var x0 = p.x + node.w/2;
278
--- src/graph.js
+++ src/graph.js
@@ -183,11 +183,11 @@
183 cls += "v";
184 }else{
185 y1 = y0+elem.w;
186 cls += "h";
187 }
188 return drawBox(cls,color,x0,y0,x1,y1);
189 }
190 function drawUpArrow(from,to,color){
191 var y = to.y + node.h;
192 var arrowSpace = from.y - y + (!from.id || from.r!=to.r ? node.h/2 : 0);
193 var arw = arrowSpace < arrow.h*1.5 ? arrowSmall : arrow;
@@ -201,11 +201,12 @@
201 }
202 function drawDotted(from,to,color){
203 var x = to.x + (node.w-line.w)/2;
204 var y0 = from.y + node.h/2;
205 var y1 = Math.ceil(to.y + node.h);
206 var n = drawLine(dotLine,null,x,y0,null,y1)
207 if( color ) n.style.borderColor = color
208 }
209 /* Draw thin horizontal or vertical lines representing merges */
210 function drawMergeLine(x0,y0,x1,y1){
211 drawLine(mLine,null,x0,y0,x1,y1);
212 }
@@ -243,11 +244,11 @@
244 e = document.getElementById("md"+p.id);
245 if(e) e.style.backgroundColor = p.bg;
246 }
247 if( p.r<0 ) return;
248 if( p.u>0 ) drawUpArrow(p,tx.rowinfo[p.u-tx.iTopRow],p.fg);
249 if( p.sb>0 ) drawDotted(p,tx.rowinfo[p.sb-tx.iTopRow],p.fg);
250 var cls = node.cls;
251 if( p.hasOwnProperty('mi') && p.mi.length ) cls += " merge";
252 if( p.f&1 ) cls += " leaf";
253 var n = drawBox(cls,p.bg,p.x,p.y);
254 n.id = "tln"+p.id;
@@ -267,11 +268,11 @@
268 if( p.hasOwnProperty('d') ){
269 if( p.y + 150 >= btm ){
270 drawUpArrow({x: p.x, y: btm - node.h/2},p,p.fg);
271 }else{
272 drawUpArrow({x: p.x, y: p.y+50},p,p.fg);
273 drawDotted({x: p.x, y: p.y+63},{x: p.x, y: p.y+50-node.h/2},p.fg);
274 }
275 }
276 }
277 if( p.hasOwnProperty('mo') ){
278 var x0 = p.x + node.w/2;
279

Keyboard Shortcuts

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