migrated octagon symbol

pull/95/head
jmoenig 2020-02-10 17:24:29 +01:00
rodzic 5dd246dd24
commit 7f07cd1118
1 zmienionych plików z 6 dodań i 8 usunięć

Wyświetl plik

@ -51,7 +51,7 @@ WorldMorph.prototype.customMorphs = function () {
return [ return [
new SymbolMorph( new SymbolMorph(
'flag', 'octagon',
50, 50,
new Color(250, 250, 250), new Color(250, 250, 250),
new Point(-1, -1), new Point(-1, -1),
@ -96,8 +96,8 @@ SymbolMorph.prototype.names = [
'stage', 'stage',
'pause', 'pause',
'flag', 'flag',
'octagon', 'octagon',
'cloud', 'cloud',
'cloudOutline', 'cloudOutline',
'cloudGradient', 'cloudGradient',
@ -256,7 +256,8 @@ SymbolMorph.prototype.renderShape = function (ctx, aColor) {
this.renderSymbolFlag(ctx, aColor); this.renderSymbolFlag(ctx, aColor);
break; break;
case 'octagon': case 'octagon':
return this.drawSymbolOctagon(canvas, aColor); this.renderSymbolOctagon(ctx, aColor);
break;
case 'cloud': case 'cloud':
return this.drawSymbolCloud(canvas, aColor); return this.drawSymbolCloud(canvas, aColor);
case 'cloudOutline': case 'cloudOutline':
@ -654,10 +655,9 @@ SymbolMorph.prototype.renderSymbolFlag = function (ctx, color) {
ctx.stroke(); ctx.stroke();
}; };
SymbolMorph.prototype.drawSymbolOctagon = function (canvas, color) { SymbolMorph.prototype.renderSymbolOctagon = function (ctx, color) {
// answer a canvas showing an octagon // answer a canvas showing an octagon
var ctx = canvas.getContext('2d'), var side = this.symbolWidth(),
side = canvas.width,
vert = (side - (side * 0.383)) / 2; vert = (side - (side * 0.383)) / 2;
ctx.fillStyle = color.toString(); ctx.fillStyle = color.toString();
@ -672,8 +672,6 @@ SymbolMorph.prototype.drawSymbolOctagon = function (canvas, color) {
ctx.lineTo(0, vert); ctx.lineTo(0, vert);
ctx.closePath(); ctx.closePath();
ctx.fill(); ctx.fill();
return canvas;
}; };
SymbolMorph.prototype.drawSymbolCloud = function (canvas, color) { SymbolMorph.prototype.drawSymbolCloud = function (canvas, color) {