github/scratch-render
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #369 from towerofnix/fix-empty-speech-bubble-size

Browse Source 
Fix empty speech bubbles showing up squished
This commit is contained in:
Paul Kaplan
2018-11-26 16:31:59 -05:00
committed by GitHub
parent 4ae7e32b8c 4189377128
commit 1a2b7a6253
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/util/svg-text-bubble.js
View File

@@ -145,11 +145,16 @@ class SVGTextBubble {
</g>`;
}
_getTextSize () {
const svgString = this._wrapSvgFragment(this._textFragment);
_getTextSize (textFragment) {
const svgString = this._wrapSvgFragment(textFragment);
if (!this._textSizeCache[svgString]) {
this._textSizeCache[svgString] = this.svgRenderer.measure(svgString);
if (this._textSizeCache[svgString].height === 0) {
// The speech bubble is empty, so use the height of a single line with content (or else it renders
// weirdly, see issue #302).
const dummyFragment = this._buildTextFragment('X');
this._textSizeCache[svgString] = this._getTextSize(dummyFragment);
}
}
return this._textSizeCache[svgString];
}
@@ -183,7 +188,7 @@ class SVGTextBubble {
let fragment = '';
const radius = 16;
const {x, y, width, height} = this._getTextSize();
const {x, y, width, height} = this._getTextSize(this._textFragment);
const padding = 10;
const fullWidth = Math.max(MIN_WIDTH, width) + (2 * padding);
const fullHeight = height + (2 * padding);