Fossil SCM

Do not use <canvas> when the height of the graph is greater than 32767. Ticket [13536c292b60].

drh 2010-03-22 13:41 trunk
Commit 81751fa51b002fd18b81b862408c6874ea146dd0
1 file changed +2 -3
+2 -3
--- src/timeline.c
+++ src/timeline.c
@@ -402,11 +402,10 @@
402402
cgi_printf("var nrail = %d\n", pGraph->mxRail+1);
403403
graph_free(pGraph);
404404
@ var canvasDiv = document.getElementById("canvas");
405405
@ var realCanvas = null;
406406
@ function drawBox(color,x0,y0,x1,y1){
407
- @ if( y1>32767 || y0>32767 ) return;
408407
@ var n = document.createElement("div");
409408
@ if( x0>x1 ){ var t=x0; x0=x1; x1=t; }
410409
@ if( y0>y1 ){ var t=y0; y0=y1; y1=t; }
411410
@ var w = x1-x0+1;
412411
@ var h = y1-y0+1;
@@ -515,14 +514,14 @@
515514
@ rowinfo[i].x = left + rowinfo[i].r*20;
516515
@ }
517516
@ var btm = rowinfo[rowinfo.length-1].y + 20;
518517
@ canvasDiv.innerHTML = '<canvas id="timeline-canvas" '+
519518
@ 'style="position:absolute;left:'+(left-5)+'px;"' +
520
- @ ' width="'+width+'" height="'+(btm>32767?32767:btm)+'"></canvas>';
519
+ @ ' width="'+width+'" height="'+btm+'"></canvas>';
521520
@ realCanvas = document.getElementById('timeline-canvas');
522521
@ var context;
523
- @ if( realCanvas && realCanvas.getContext
522
+ @ if( realCanvas && realCanvas.getContext && btm<32768
524523
@ && (context = realCanvas.getContext('2d'))) {
525524
@ drawBox = function(color,x0,y0,x1,y1) {
526525
@ if( y0>32767 || y1>32767 ) return;
527526
@ var colors = {
528527
@ 'white':'rgba(255,255,255,1)',
529528
--- src/timeline.c
+++ src/timeline.c
@@ -402,11 +402,10 @@
402 cgi_printf("var nrail = %d\n", pGraph->mxRail+1);
403 graph_free(pGraph);
404 @ var canvasDiv = document.getElementById("canvas");
405 @ var realCanvas = null;
406 @ function drawBox(color,x0,y0,x1,y1){
407 @ if( y1>32767 || y0>32767 ) return;
408 @ var n = document.createElement("div");
409 @ if( x0>x1 ){ var t=x0; x0=x1; x1=t; }
410 @ if( y0>y1 ){ var t=y0; y0=y1; y1=t; }
411 @ var w = x1-x0+1;
412 @ var h = y1-y0+1;
@@ -515,14 +514,14 @@
515 @ rowinfo[i].x = left + rowinfo[i].r*20;
516 @ }
517 @ var btm = rowinfo[rowinfo.length-1].y + 20;
518 @ canvasDiv.innerHTML = '<canvas id="timeline-canvas" '+
519 @ 'style="position:absolute;left:'+(left-5)+'px;"' +
520 @ ' width="'+width+'" height="'+(btm>32767?32767:btm)+'"></canvas>';
521 @ realCanvas = document.getElementById('timeline-canvas');
522 @ var context;
523 @ if( realCanvas && realCanvas.getContext
524 @ && (context = realCanvas.getContext('2d'))) {
525 @ drawBox = function(color,x0,y0,x1,y1) {
526 @ if( y0>32767 || y1>32767 ) return;
527 @ var colors = {
528 @ 'white':'rgba(255,255,255,1)',
529
--- src/timeline.c
+++ src/timeline.c
@@ -402,11 +402,10 @@
402 cgi_printf("var nrail = %d\n", pGraph->mxRail+1);
403 graph_free(pGraph);
404 @ var canvasDiv = document.getElementById("canvas");
405 @ var realCanvas = null;
406 @ function drawBox(color,x0,y0,x1,y1){
 
407 @ var n = document.createElement("div");
408 @ if( x0>x1 ){ var t=x0; x0=x1; x1=t; }
409 @ if( y0>y1 ){ var t=y0; y0=y1; y1=t; }
410 @ var w = x1-x0+1;
411 @ var h = y1-y0+1;
@@ -515,14 +514,14 @@
514 @ rowinfo[i].x = left + rowinfo[i].r*20;
515 @ }
516 @ var btm = rowinfo[rowinfo.length-1].y + 20;
517 @ canvasDiv.innerHTML = '<canvas id="timeline-canvas" '+
518 @ 'style="position:absolute;left:'+(left-5)+'px;"' +
519 @ ' width="'+width+'" height="'+btm+'"></canvas>';
520 @ realCanvas = document.getElementById('timeline-canvas');
521 @ var context;
522 @ if( realCanvas && realCanvas.getContext && btm<32768
523 @ && (context = realCanvas.getContext('2d'))) {
524 @ drawBox = function(color,x0,y0,x1,y1) {
525 @ if( y0>32767 || y1>32767 ) return;
526 @ var colors = {
527 @ 'white':'rgba(255,255,255,1)',
528

Keyboard Shortcuts

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