Skip to content
This repository was archived by the owner on Jul 29, 2019. It is now read-only.

Fix #2922: bold label for selected ShapeBase classes. #2924

Merged
merged 6 commits into from
May 13, 2017
Merged

Fix #2922: bold label for selected ShapeBase classes. #2924

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2e4f45f
Fix #2922: bold label for selected ShapeBase classes.
wimrijnders Mar 28, 2017
05ef947
Merge branch 'develop' into PR33
mojoaxel Mar 28, 2017
928d838
Merge branch 'develop' into PR33
yotamberk Apr 11, 2017
c866af5
Merged with develop, resolved conflict
wimrijnders Apr 21, 2017
a4702de
Merge branch 'PR33' of github.com:wimrijnders/vis into PR33
wimrijnders Apr 21, 2017
c31c055
Merge branch 'develop' into PR33
yotamberk May 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions lib/network/modules/components/nodes/shapes/Diamond.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
4 changes: 0 additions & 4 deletions lib/network/modules/components/nodes/shapes/Dot.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
4 changes: 0 additions & 4 deletions lib/network/modules/components/nodes/shapes/Square.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
4 changes: 0 additions & 4 deletions lib/network/modules/components/nodes/shapes/Star.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
4 changes: 0 additions & 4 deletions lib/network/modules/components/nodes/shapes/Triangle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
4 changes: 0 additions & 4 deletions lib/network/modules/components/nodes/shapes/TriangleDown.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
5 changes: 3 additions & 2 deletions lib/network/modules/components/nodes/util/ShapeBase.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down