diff --git a/lib/network/modules/components/nodes/shapes/Diamond.js b/lib/network/modules/components/nodes/shapes/Diamond.js index ecda7ea3..20a8f7db 100644 --- a/lib/network/modules/components/nodes/shapes/Diamond.js +++ b/lib/network/modules/components/nodes/shapes/Diamond.js @@ -7,10 +7,6 @@ class Diamond extends ShapeBase { super(options, body, labelModule) } - resize(ctx, selected = this.selected, hover = this.hover, values) { - this._resizeShape(selected, hover, values); - } - draw(ctx, x, y, selected, hover, values) { this._drawShape(ctx, 'diamond', 4, x, y, selected, hover, values); } diff --git a/lib/network/modules/components/nodes/shapes/Dot.js b/lib/network/modules/components/nodes/shapes/Dot.js index 6d054619..79746753 100644 --- a/lib/network/modules/components/nodes/shapes/Dot.js +++ b/lib/network/modules/components/nodes/shapes/Dot.js @@ -7,10 +7,6 @@ class Dot extends ShapeBase { super(options, body, labelModule) } - resize(ctx, selected = this.selected, hover = this.hover, values) { - this._resizeShape(selected, hover, values); - } - draw(ctx, x, y, selected, hover, values) { this._drawShape(ctx, 'circle', 2, x, y, selected, hover, values); } diff --git a/lib/network/modules/components/nodes/shapes/Square.js b/lib/network/modules/components/nodes/shapes/Square.js index b7b7e8bf..3dba0807 100644 --- a/lib/network/modules/components/nodes/shapes/Square.js +++ b/lib/network/modules/components/nodes/shapes/Square.js @@ -7,10 +7,6 @@ class Square extends ShapeBase { super(options, body, labelModule) } - resize() { - this._resizeShape(); - } - draw(ctx, x, y, selected, hover, values) { this._drawShape(ctx, 'square', 2, x, y, selected, hover, values); } diff --git a/lib/network/modules/components/nodes/shapes/Star.js b/lib/network/modules/components/nodes/shapes/Star.js index b99bc4e4..2b1437f8 100644 --- a/lib/network/modules/components/nodes/shapes/Star.js +++ b/lib/network/modules/components/nodes/shapes/Star.js @@ -7,10 +7,6 @@ class Star extends ShapeBase { super(options, body, labelModule) } - resize(ctx, selected, hover, values) { - this._resizeShape(selected, hover, values); - } - draw(ctx, x, y, selected, hover, values) { this._drawShape(ctx, 'star', 4, x, y, selected, hover, values); } diff --git a/lib/network/modules/components/nodes/shapes/Triangle.js b/lib/network/modules/components/nodes/shapes/Triangle.js index 2a75476c..9b35304f 100644 --- a/lib/network/modules/components/nodes/shapes/Triangle.js +++ b/lib/network/modules/components/nodes/shapes/Triangle.js @@ -7,10 +7,6 @@ class Triangle extends ShapeBase { super(options, body, labelModule) } - resize(ctx) { - this._resizeShape(); - } - draw(ctx, x, y, selected, hover, values) { this._drawShape(ctx, 'triangle', 3, x, y, selected, hover, values); } diff --git a/lib/network/modules/components/nodes/shapes/TriangleDown.js b/lib/network/modules/components/nodes/shapes/TriangleDown.js index a566a103..453056f3 100644 --- a/lib/network/modules/components/nodes/shapes/TriangleDown.js +++ b/lib/network/modules/components/nodes/shapes/TriangleDown.js @@ -7,10 +7,6 @@ class TriangleDown extends ShapeBase { super(options, body, labelModule) } - resize(ctx) { - this._resizeShape(); - } - draw(ctx, x, y, selected, hover, values) { this._drawShape(ctx, 'triangleDown', 3, x, y, selected, hover, values); } diff --git a/lib/network/modules/components/nodes/util/ShapeBase.js b/lib/network/modules/components/nodes/util/ShapeBase.js index 646e36b5..6c2e14e3 100644 --- a/lib/network/modules/components/nodes/util/ShapeBase.js +++ b/lib/network/modules/components/nodes/util/ShapeBase.js @@ -5,8 +5,9 @@ class ShapeBase extends NodeBase { super(options, body, labelModule) } - _resizeShape(selected = this.selected, hover = this.hover, values = { size: this.options.size }) { + resize(ctx, selected = this.selected, hover = this.hover, values = { size: this.options.size }) { if (this.needsRefresh(selected, hover)) { + this.labelModule.getTextSize(ctx, selected, hover); var size = 2 * values.size; this.width = size; this.height = size; @@ -15,7 +16,7 @@ class ShapeBase extends NodeBase { } _drawShape(ctx, shape, sizeMultiplier, x, y, selected, hover, values) { - this._resizeShape(selected, hover, values); + this.resize(ctx, selected, hover, values); this.left = x - this.width / 2; this.top = y - this.height / 2;