From dd3639f2adf5cd86d00e8ad5d9eae2f4de0f5f16 Mon Sep 17 00:00:00 2001 From: Chas Honton Date: Wed, 10 Aug 2016 19:40:53 -0700 Subject: [PATCH 1/2] decrease whitespace in ellipses having long text --- lib/network/modules/components/nodes/shapes/Ellipse.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/network/modules/components/nodes/shapes/Ellipse.js b/lib/network/modules/components/nodes/shapes/Ellipse.js index b4d0a28a..69a2d6db 100644 --- a/lib/network/modules/components/nodes/shapes/Ellipse.js +++ b/lib/network/modules/components/nodes/shapes/Ellipse.js @@ -11,11 +11,8 @@ class Ellipse extends NodeBase { if (this.width === undefined) { var textSize = this.labelModule.getTextSize(ctx, selected); - this.width = textSize.width * 1.5; this.height = textSize.height * 2; - if (this.width < this.height) { - this.width = this.height; - } + this.width = textSize.width + this.height; this.radius = 0.5*this.width; } } @@ -82,4 +79,4 @@ class Ellipse extends NodeBase { } } -export default Ellipse; \ No newline at end of file +export default Ellipse; From 30620e4c6394e0149d9f9527db758490dd75c64a Mon Sep 17 00:00:00 2001 From: Alexander Wunschik Date: Thu, 11 Aug 2016 10:29:58 +0200 Subject: [PATCH 2/2] improved shape example with a ellipse with long label text; see #2011 --- examples/network/nodeStyles/shapes.html | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/examples/network/nodeStyles/shapes.html b/examples/network/nodeStyles/shapes.html index 1f4b92ba..68dcf8c3 100644 --- a/examples/network/nodeStyles/shapes.html +++ b/examples/network/nodeStyles/shapes.html @@ -34,15 +34,16 @@ {id: 11, label: 'star', shape: 'star'}, {id: 21, font:{size:30}, label: 'big circle', shape: 'circle' }, {id: 22, font:{size:30}, label: 'big ellipse', shape: 'ellipse'}, - {id: 23, font:{size:30}, label: 'big database',shape: 'database'}, - {id: 24, font:{size:30}, label: 'big box', shape: 'box' }, - {id: 25, font:{size:30}, size:40, label: 'big diamond', shape: 'diamond'}, - {id: 26, font:{size:30}, size:40, label: 'big dot', shape: 'dot'}, - {id: 27, font:{size:30}, size:40, label: 'big square', shape: 'square'}, - {id: 28, font:{size:30}, size:40, label: 'big triangle',shape: 'triangle'}, - {id: 29, font:{size:30}, size:40, label: 'big triangleDown', shape: 'triangleDown'}, - {id: 30, font:{size:30}, label: 'big text', shape: 'text'}, - {id: 31, font:{size:30}, size:40, label: 'big star', shape: 'star'} + {id: 23, font:{size:30}, label: 'ellipse with a long label text', shape: 'ellipse'}, + {id: 24, font:{size:30}, label: 'big database',shape: 'database'}, + {id: 25, font:{size:30}, label: 'big box', shape: 'box' }, + {id: 26, font:{size:30}, size:40, label: 'big diamond', shape: 'diamond'}, + {id: 27, font:{size:30}, size:40, label: 'big dot', shape: 'dot'}, + {id: 28, font:{size:30}, size:40, label: 'big square', shape: 'square'}, + {id: 29, font:{size:30}, size:40, label: 'big triangle',shape: 'triangle'}, + {id: 30, font:{size:30}, size:40, label: 'big triangleDown', shape: 'triangleDown'}, + {id: 31, font:{size:30}, label: 'big text', shape: 'text'}, + {id: 32, font:{size:30}, size:40, label: 'big star', shape: 'star'} ]; edges = [