Attachment 232256 Details for Bug 410517 – work in progress

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

work in progress

file_410517.txt (text/plain), 8.42 KB, created by Silenio Quarti

on 2013-06-11 14:36:39 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Silenio Quarti

Created: 2013-06-11 14:36:39 EDT

Size: 8.42 KB

patch

obsolete

>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/widgets/themes/ThemeBuilder.js b/bundles/org.eclipse.orion.client.ui/web/orion/widgets/themes/ThemeBuilder.js
>index 183d28d..735e3e5 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/widgets/themes/ThemeBuilder.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/widgets/themes/ThemeBuilder.js
>@@ -452,7 +452,7 @@
> 					
> 					labely = TOP + 10 + ( count * 28 );
> 					
>-					var originx = component.x-padding + ( component.width + (2*padding) ) * 0.5;
>+					var originx = component.x-padding + ( component.width + (2*padding) )/2;
> 					var originy = ( component.y-padding + ( component.height + (2*padding) )/2 );
> 					
> 					ctx.beginPath();
>@@ -465,13 +465,13 @@
> 								routine. Not pleased to do this. */
> 
> 							ctx.beginPath();
>-							ctx.moveTo( originx + 70 , labely -4 );
>-							ctx.lineTo( UI_SIZE + 50, labely -4 );
>+							ctx.moveTo( originx + 70 + 0.5 , labely -4 + 0.5 );
>+							ctx.lineTo( UI_SIZE + 50 + 0.5, labely -4 + 0.5 );
> 							ctx.strokeStyle = 'rgba(187,0,0,0.7)';
>-							ctx.lineWidth = 0.5;
>+							ctx.lineWidth = 1;
> 							ctx.stroke();
> 							
>-							Component.drawArc( ctx, originx + 70 , labely -4, 3, 0, 2 * Math.PI, false, null, 'rgba(187,0,0,0.7)' );
>+							Component.drawArc( ctx, originx + 70 + 0.5 , labely -4 + 0.5, 3, 0, 2 * Math.PI, false, null, 'rgba(187,0,0,0.7)' );
> 
> 							break;
> 							
>@@ -479,26 +479,26 @@
> 						case 'Side':
> 						
> 							ctx.beginPath();
>-							ctx.moveTo( originx + 30 , labely -4 );
>-							ctx.lineTo( UI_SIZE + 50, labely -4 );
>+							ctx.moveTo( originx + 30 + 0.5 , labely -4 + 0.5 );
>+							ctx.lineTo( UI_SIZE + 50 + 0.5, labely -4 + 0.5 );
> 							ctx.strokeStyle = 'rgba(187,0,0,0.7)';
>-							ctx.lineWidth = 0.5;
>+							ctx.lineWidth = 1;
> 							ctx.stroke();
> 							
>-							Component.drawArc( ctx, originx + 30 , labely -4, 3, 0, 2 * Math.PI, false, null, 'rgba(187,0,0,0.7)' );
>+							Component.drawArc( ctx, originx + 30 + 0.5 , labely -4 + 0.5, 3, 0, 2 * Math.PI, false, null, 'rgba(187,0,0,0.7)' );
> 
> 							break;
> 							
> 						default: 
> 						
>-							ctx.moveTo( originx, originy );
>-							ctx.lineTo( originx, labely -4 );
>-							ctx.lineTo( UI_SIZE + 50, labely -4 );
>+							ctx.moveTo( originx + 0.5, originy + 0.5 );
>+							ctx.lineTo( originx + 0.5, labely -4 + 0.5 );
>+							ctx.lineTo( UI_SIZE + 50 + 0.5, labely -4 + 0.5 );
> 							ctx.strokeStyle = 'rgba(187,0,0,0.7)';
>-							ctx.lineWidth = 0.5;
>+							ctx.lineWidth = 1;
> 							ctx.stroke();
> 							
>-							Component.drawArc( ctx, originx, originy, 3, 0, 2 * Math.PI, false, null, 'rgba(187,0,0,0.7)' );
>+							Component.drawArc( ctx, originx + 0.5, originy + 0.5, 3, 0, 2 * Math.PI, false, null, 'rgba(187,0,0,0.7)' );
> 							
> 							break;
> 					}
>@@ -506,7 +506,7 @@
> 					ctx.closePath();
> 					ctx.globalAlpha = 1; 
> 					
>-					Component.drawText( ctx, component.description.toUpperCase(), LEFT + 5 + x, labely, 'bold 8pt sans-serif', '#333' );	
>+					Component.drawText( ctx, component.description.toUpperCase(), LEFT + 5 + x + 0.5, labely + 0.5, 'bold 8pt sans-serif', '#333' );	
> 					
> 					if( component.family ){ families.push( component.family ); }
> 					
>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/widgets/themes/ThemeComponent.js b/bundles/org.eclipse.orion.client.ui/web/orion/widgets/themes/ThemeComponent.js
>index 422da43..3d887b2 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/widgets/themes/ThemeComponent.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/widgets/themes/ThemeComponent.js
>@@ -51,7 +51,7 @@
> 						this.context.beginPath();
> 						this.context.font = this.font;
> 					    this.context.fillStyle = this.fill;
>-					    this.context.fillText(this.text, this.x, this.y );
>+					    this.context.fillText(this.text, this.x + 0.5, this.y + 0.5 );
> 					    this.context.closePath();
> 						break;
> 					
>@@ -59,8 +59,8 @@
> 			
> 						this.context.beginPath();
> 						this.context.strokeStyle = this.stroke;
>-						this.context.moveTo( this.x, this.y );
>-						this.context.lineTo( this.x2, this.y2 );
>+						this.context.moveTo( this.x + 0.5, this.y + 0.5 );
>+						this.context.lineTo( this.x2 + 0.5, this.y2 + 0.5 );
> 						this.context.lineWidth = this.width;
> 						this.context.stroke();
> 						this.context.closePath();
>@@ -70,7 +70,7 @@
> 						this.context.beginPath();
> 						this.context.strokeStyle = this.stroke;
> 						if( this.fill ){ this.context.fillStyle = this.fill; }
>-						this.context.rect( this.x, this.y, this.width, this.height );
>+						this.context.rect( this.x + 0.5, this.y + 0.5, this.width, this.height );
> 						if( this.fill ){ this.context.fill(); }  
> 						if( this.stroke ){ this.context.stroke(); }
> 						this.context.closePath();
>@@ -81,15 +81,15 @@
> 						this.context.beginPath();
> 						this.context.fillStyle = this.fill;
> 						this.context.strokeStyle = this.stroke;
>-						this.context.moveTo(this.x + this.radius, this.y);
>-						this.context.lineTo(this.x + this.width - this.radius, this.y);
>-						this.context.quadraticCurveTo(this.x + this.width, this.y, this.x + this.width, this.y + this.radius);
>-						this.context.lineTo(this.x + this.width, this.y + this.height - this.radius);
>-						this.context.quadraticCurveTo( this.x + this.width, this.y + this.height, this.x + this.width - this.radius, this.y + this.height);
>-						this.context.lineTo(this.x + this.radius, this.y + this.height);
>-						this.context.quadraticCurveTo(this.x, this.y + this.height, this.x, this.y + this.height - this.radius);
>-						this.context.lineTo(this.x, this.y + this.radius);
>-						this.context.quadraticCurveTo(this.x, this.y, this.x + this.radius, this.y);
>+						this.context.moveTo(this.x + this.radius + 0.5, this.y + 0.5);
>+						this.context.lineTo(this.x + this.width - this.radius + 0.5, this.y + 0.5);
>+						this.context.quadraticCurveTo(this.x + this.width + 0.5, this.y + 0.5, this.x + this.width + 0.5, this.y + this.radius + 0.5);
>+						this.context.lineTo(this.x + this.width + 0.5, this.y + this.height - this.radius + 0.5);
>+						this.context.quadraticCurveTo( this.x + this.width + 0.5, this.y + this.height + 0.5, this.x + this.width - this.radius + 0.5, this.y + this.height + 0.5);
>+						this.context.lineTo(this.x + this.radius + 0.5, this.y + this.height + 0.5);
>+						this.context.quadraticCurveTo(this.x + 0.5, this.y + this.height + 0.5, this.x + 0.5, this.y + this.height - this.radius + 0.5);
>+						this.context.lineTo(this.x + 0.5, this.y + this.radius + 0.5);
>+						this.context.quadraticCurveTo(this.x + 0.5, this.y + 0.5, this.x + this.radius + 0.5, this.y + 0.5);
> 						this.context.closePath();
> 					  
> 						if( this.stroke ){ this.context.stroke(); }
>@@ -98,10 +98,10 @@
> 						
> 					case 'TRIANGLE':
> 						this.context.beginPath();
>-						this.context.moveTo( this.x, this.y );
>-						this.context.lineTo( this.x2, this.y2 );
>-						this.context.lineTo( this.x3, this.y3 );
>-						this.context.lineTo( this.x, this.y );
>+						this.context.moveTo( this.x + 0.5, this.y + 0.5 );
>+						this.context.lineTo( this.x2 + 0.5, this.y2 + 0.5 );
>+						this.context.lineTo( this.x3 + 0.5, this.y3 + 0.5 );
>+						this.context.lineTo( this.x + 0.5, this.y + 0.5 );
> 						this.context.fillStyle = this.fill;
> 						this.context.fill();
> 						this.context.closePath();
>@@ -110,7 +110,7 @@
> 					case 'ELLIPSE':	
> 					
> 						this.context.beginPath();
>-						this.context.arc( this.x, this.y, this.radius, this.startangle, this.endangle, this.direction );
>+						this.context.arc( this.x + 0.5, this.y + 0.5, this.radius, this.startangle, this.endangle, this.direction );
> 						this.context.fillStyle = this.fill;
> 						this.context.fill();
> 						this.context.closePath();
>@@ -267,10 +267,10 @@
> 			var originx = this.x-padding + ( this.width + (2*padding) ) * 0.5;
> 			
> 			this.context.beginPath();
>-			this.context.moveTo( originx, originy );
>-			this.context.lineTo( width + 30, originy );
>-			this.context.lineTo( width + 30, top + 7 );
>-			this.context.lineTo( width + 45, top + 7 );
>+			this.context.moveTo( originx + 0.5, originy + 0.5 );
>+			this.context.lineTo( width + 30 + 0.5, originy + 0.5 );
>+			this.context.lineTo( width + 30 + 0.5, top + 7 + 0.5 );
>+			this.context.lineTo( width + 45 + 0.5, top + 7 + 0.5 );
> 			this.context.strokeStyle = '#cc0000';
> 			this.context.lineWidth = 1;
> 			this.context.stroke();

Actions: View

Attachments on bug 410517: 232256