Hopiu/fabric.js
1
0
Fork 0
mirror of https://github.com/Hopiu/fabric.js.git synced 2026-04-25 07:54:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix text minimum dimensions (#3312)

Browse source 
* fix text dim
* add tests
This commit is contained in:
Andrea Bogazzi 2016-10-02 11:00:17 +02:00 committed by GitHub
parent 224309a4c7
commit cd4c465f4c
4 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/shapes/text.class.js
View file

@ -6,7 +6,8 @@
extend = fabric.util.object.extend,
clone = fabric.util.object.clone,
toFixed = fabric.util.toFixed,
NUM_FRACTION_DIGITS = fabric.Object.NUM_FRACTION_DIGITS;
NUM_FRACTION_DIGITS = fabric.Object.NUM_FRACTION_DIGITS,
MIN_TEXT_WIDTH = 2;
if (fabric.Text) {
fabric.warn('fabric.Text is already defined');
@ -359,7 +360,7 @@
}
this._textLines = this._splitTextIntoLines();
this._clearCache();
this.width = this._getTextWidth(ctx);
this.width = this._getTextWidth(ctx) || this.cursorWidth || MIN_TEXT_WIDTH;
this.height = this._getTextHeight(ctx);
},

4
src/shapes/textbox.class.js
View file

@ -34,10 +34,12 @@
/**
* Minimum calculated width of a textbox, in pixels.
* fixed to 2 so that an empty textbox cannot go to 0
* and is still selectable without text.
* @type Number
* @default
*/
dynamicMinWidth: 0,
dynamicMinWidth: 2,
/**
* Cached array of text wrapping.

5
test/unit/itext.js
View file

@ -151,6 +151,11 @@
equal(iText.selectionEnd, 0);
});
test('empty itext', function() {
var iText = new fabric.IText('');
equal(iText.width, iText.cursorWidth);
})
test('setSelectionEnd', function() {
var iText = new fabric.IText('test');

5
test/unit/text.js
View file

@ -270,6 +270,11 @@
equal(text.width, CHAR_WIDTH * 2);
});
test('dimensions without text', function() {
var text = new fabric.Text('');
equal(text.width, 2);
});
test('setting fontFamily', function() {
var text = new fabric.Text('x');
text.path = 'foobar.js';