Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix the elipsis at the bottom of decenders so that they are the same color as the rest of the line. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | graph-improvements |
| Files: | files | file ages | folders |
| SHA3-256: |
34fd632e165727f771e30adf1cb2bc47 |
| User & Date: | drh 2019-05-16 22:35:47 |
Context
|
2019-05-16
| ||
| 22:53 | Improved merge risers for nodes with risers pointing to the top of screen. check-in: aa854c87 user: drh tags: graph-improvements | |
| 22:35 | Fix the elipsis at the bottom of decenders so that they are the same color as the rest of the line. check-in: 34fd632e user: drh tags: graph-improvements | |
| 22:14 | Connect the horizontal merge arrow all the way over to vertical rises toward the top for nodes with u==0. check-in: d76bc405 user: drh tags: graph-improvements | |
Changes
Changes to src/default_css.txt.
187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 |
margin-left: 1px;
border-width: 3px 0;
border-left: 7px solid #600000;
}
.tl-line.warp {
background: #600000;
}
.tl-line.dotted {
width: 0px;
border-top: 0px dotted #888;
border-left: 2px dotted #888;
background: rgba(255,255,255,0);
}
span.tagDsp {
font-weight: bold;
}
span.wikiError {
font-weight: bold;
|
| | | |
187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 |
margin-left: 1px;
border-width: 3px 0;
border-left: 7px solid #600000;
}
.tl-line.warp {
background: #600000;
}
.tl-line.dotted.v {
width: 0px;
border-left-width: 2px;
border-left-style: dotted;
background: rgba(255,255,255,0);
}
span.tagDsp {
font-weight: bold;
}
span.wikiError {
font-weight: bold;
|
Changes to src/graph.js.
181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 ... 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 ... 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 ... 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 |
if( x1===null ){
x1 = x0+elem.w;
cls += "v";
}else{
y1 = y0+elem.w;
cls += "h";
}
drawBox(cls,color,x0,y0,x1,y1);
}
function drawUpArrow(from,to,color){
var y = to.y + node.h;
var arrowSpace = from.y - y + (!from.id || from.r!=to.r ? node.h/2 : 0);
var arw = arrowSpace < arrow.h*1.5 ? arrowSmall : arrow;
var x = to.x + (node.w-line.w)/2;
var y0 = from.y + node.h/2;
................................................................................
var n = drawBox(arw.cls,null,x,y);
if(color) n.style.borderBottomColor = color;
}
function drawDotted(from,to,color){
var x = to.x + (node.w-line.w)/2;
var y0 = from.y + node.h/2;
var y1 = Math.ceil(to.y + node.h);
drawLine(dotLine,color,x,y0,null,y1);
}
/* Draw thin horizontal or vertical lines representing merges */
function drawMergeLine(x0,y0,x1,y1){
drawLine(mLine,null,x0,y0,x1,y1);
}
function drawCherrypickLine(x0,y0,x1,y1){
drawLine(cpLine,null,x0,y0,x1,y1);
................................................................................
var e = document.getElementById("mc"+p.id);
if(e) e.style.backgroundColor = p.bg;
e = document.getElementById("md"+p.id);
if(e) e.style.backgroundColor = p.bg;
}
if( p.r<0 ) return;
if( p.u>0 ) drawUpArrow(p,tx.rowinfo[p.u-tx.iTopRow],p.fg);
if( p.sb>0 ) drawDotted(p,tx.rowinfo[p.sb-tx.iTopRow],null);
var cls = node.cls;
if( p.hasOwnProperty('mi') && p.mi.length ) cls += " merge";
if( p.f&1 ) cls += " leaf";
var n = drawBox(cls,p.bg,p.x,p.y);
n.id = "tln"+p.id;
n.onclick = clickOnNode;
n.style.zIndex = 10;
................................................................................
}
}
if( p.hasOwnProperty('d') ){
if( p.y + 150 >= btm ){
drawUpArrow({x: p.x, y: btm - node.h/2},p,p.fg);
}else{
drawUpArrow({x: p.x, y: p.y+50},p,p.fg);
drawDotted({x: p.x, y: p.y+63},{x: p.x, y: p.y+50-node.h/2},null);
}
}
}
if( p.hasOwnProperty('mo') ){
var x0 = p.x + node.w/2;
var x1 = p.mo*railPitch + node.w/2;
var u = tx.rowinfo[p.mu-tx.iTopRow];
|
| | > | | |
181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 ... 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 ... 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 ... 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 |
if( x1===null ){
x1 = x0+elem.w;
cls += "v";
}else{
y1 = y0+elem.w;
cls += "h";
}
return drawBox(cls,color,x0,y0,x1,y1);
}
function drawUpArrow(from,to,color){
var y = to.y + node.h;
var arrowSpace = from.y - y + (!from.id || from.r!=to.r ? node.h/2 : 0);
var arw = arrowSpace < arrow.h*1.5 ? arrowSmall : arrow;
var x = to.x + (node.w-line.w)/2;
var y0 = from.y + node.h/2;
................................................................................
var n = drawBox(arw.cls,null,x,y);
if(color) n.style.borderBottomColor = color;
}
function drawDotted(from,to,color){
var x = to.x + (node.w-line.w)/2;
var y0 = from.y + node.h/2;
var y1 = Math.ceil(to.y + node.h);
var n = drawLine(dotLine,null,x,y0,null,y1)
if( color ) n.style.borderColor = color
}
/* Draw thin horizontal or vertical lines representing merges */
function drawMergeLine(x0,y0,x1,y1){
drawLine(mLine,null,x0,y0,x1,y1);
}
function drawCherrypickLine(x0,y0,x1,y1){
drawLine(cpLine,null,x0,y0,x1,y1);
................................................................................
var e = document.getElementById("mc"+p.id);
if(e) e.style.backgroundColor = p.bg;
e = document.getElementById("md"+p.id);
if(e) e.style.backgroundColor = p.bg;
}
if( p.r<0 ) return;
if( p.u>0 ) drawUpArrow(p,tx.rowinfo[p.u-tx.iTopRow],p.fg);
if( p.sb>0 ) drawDotted(p,tx.rowinfo[p.sb-tx.iTopRow],p.fg);
var cls = node.cls;
if( p.hasOwnProperty('mi') && p.mi.length ) cls += " merge";
if( p.f&1 ) cls += " leaf";
var n = drawBox(cls,p.bg,p.x,p.y);
n.id = "tln"+p.id;
n.onclick = clickOnNode;
n.style.zIndex = 10;
................................................................................
}
}
if( p.hasOwnProperty('d') ){
if( p.y + 150 >= btm ){
drawUpArrow({x: p.x, y: btm - node.h/2},p,p.fg);
}else{
drawUpArrow({x: p.x, y: p.y+50},p,p.fg);
drawDotted({x: p.x, y: p.y+63},{x: p.x, y: p.y+50-node.h/2},p.fg);
}
}
}
if( p.hasOwnProperty('mo') ){
var x0 = p.x + node.w/2;
var x1 = p.mo*railPitch + node.w/2;
var u = tx.rowinfo[p.mu-tx.iTopRow];
|