Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(fabric.Text): underline color with text style ( regression from textpath ) #6974

Merged
merged 5 commits into from
Mar 31, 2021
Merged

fix(fabric.Text): underline color with text style ( regression from textpath ) #6974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4c957be
added back missing line
asturur Mar 31, 2021
c196214
added test
asturur Mar 31, 2021
dd6a828
added the test golden
asturur Mar 31, 2021
686eb7e
better test
asturur Mar 31, 2021
598512e
percentage
asturur Mar 31, 2021
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: 3 additions & 1 deletion src/shapes/text.class.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1311,13 +1311,15 @@
(currentDecoration !== lastDecoration || currentFill !== lastFill || _size !== size || _dy !== dy)
&& boxWidth > 0
) {
lastDecoration && lastFill &&
if (lastDecoration && lastFill) {
ctx.fillStyle = lastFill;
ctx.fillRect(
leftOffset + lineLeftOffset + boxStart,
top + this.offsets[type] * size + dy,
boxWidth,
this.fontSize / 15
);
}
boxStart = charBox.left;
boxWidth = charBox.width;
lastDecoration = currentDecoration;
Expand Down
Binary file added test/visual/golden/text11.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
94 changes: 93 additions & 1 deletion test/visual/text.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
function text3(canvas, callback) {
var text = new fabric.Text('lorem ipsum\ndolor\nsit Amet2\nconsectgetur',
{ objectCaching: false, fontFamily: 'Arial', styles:
{'0': {'0': {'fill': 'red','fontSize': 20},'1': {'fill': 'red','fontSize': 30},'2': {'fill': 'red','fontSize': 40},'3': {'fill': 'red','fontSize': 50},'4': {'fill': 'red','fontSize': 60},'6': {'textBackgroundColor': 'yellow'},'7': {'textBackgroundColor': 'yellow','textDecoration': ' line-through','linethrough': true},'8': {'textBackgroundColor': 'yellow','textDecoration': ' line-through','linethrough': true},'9': {'textBackgroundColor': 'yellow'}},'1': {'0': {'textDecoration': 'underline'},'1': {'textDecoration': 'underline'},'2': {'fill': 'green','fontStyle': 'italic','textDecoration': 'underline'},'3': {'fill': 'green','fontStyle': 'italic','textDecoration': 'underline'},'4': {'fill': 'green','fontStyle': 'italic','textDecoration': 'underline'}},'2': {'0': {'fill': 'blue','fontWeight': 'bold'},'1': {'fill': 'blue','fontWeight': 'bold'},'2': {'fill': 'blue','fontWeight': 'bold','fontSize': 63},'4': {'fontFamily': 'Courier','textDecoration': ' underline','underline': true},'5': {'fontFamily': 'Courier','textDecoration': ' underline','underline': true},'6': {'fontFamily': 'Courier','textDecoration': ' overline','overline': true},'7': {'fontFamily': 'Courier','textDecoration': ' overline','overline': true},'8': {'fontFamily': 'Courier','textDecoration': ' overline','overline': true}},'3': {'0': {'fill': '#666','textDecoration': 'line-through'},'1': {'fill': '#666','textDecoration': 'line-through'},'2': {'fill': '#666','textDecoration': 'line-through'},'3': {'fill': '#666','textDecoration': 'line-through'},'4': {'fill': '#666','textDecoration': 'line-through'},'7': {'textDecoration': ' underline','underline': true},'8': {'stroke': '#ff1e15','strokeWidth': 2},'9': {'stroke': '#ff1e15','strokeWidth': 2}}}
{0: {0: {fill: 'red',fontSize: 20},1: {fill: 'red',fontSize: 30},2: {fill: 'red',fontSize: 40},3: {fill: 'red',fontSize: 50},4: {fill: 'red',fontSize: 60},6: {textBackgroundColor: 'yellow'},7: {textBackgroundColor: 'yellow',textDecoration: ' line-through',linethrough: true},8: {textBackgroundColor: 'yellow',textDecoration: ' line-through',linethrough: true},9: {textBackgroundColor: 'yellow'}},1: {0: {textDecoration: 'underline'},1: {textDecoration: 'underline'},2: {fill: 'green',fontStyle: 'italic',textDecoration: 'underline'},3: {fill: 'green',fontStyle: 'italic',textDecoration: 'underline'},4: {fill: 'green',fontStyle: 'italic',textDecoration: 'underline'}},2: {0: {fill: 'blue',fontWeight: 'bold'},1: {fill: 'blue',fontWeight: 'bold'},2: {fill: 'blue',fontWeight: 'bold',fontSize: 63},4: {fontFamily: 'Courier',textDecoration: ' underline',underline: true},5: {fontFamily: 'Courier',textDecoration: ' underline',underline: true},6: {fontFamily: 'Courier',textDecoration: ' overline',overline: true},7: {fontFamily: 'Courier',textDecoration: ' overline',overline: true},8: {fontFamily: 'Courier',textDecoration: ' overline',overline: true}},3: {0: {fill: '#666',textDecoration: 'line-through'},1: {fill: '#666',textDecoration: 'line-through'},2: {fill: '#666',textDecoration: 'line-through'},3: {fill: '#666',textDecoration: 'line-through'},4: {fill: '#666',textDecoration: 'line-through'},7: {textDecoration: ' underline',underline: true},8: {stroke: '#ff1e15',strokeWidth: 2},9: {stroke: '#ff1e15',strokeWidth: 2}}}
}
);
canvas.add(text);
Expand Down Expand Up @@ -356,5 +356,97 @@
percentage: 0.06,
});

function text11(canvas, callback) {
var itext = new fabric.Text('hello\nworld', {
left: 4,
top: 4,
fontFamily: 'Helvetica',
fill: 'purple',
lineHeight: 1.1,
styles: {
0: {
0: {
fill: 'red',
underline: true,
linethrough: true
},
1: {
fill: 'blue',
underline: true,
linethrough: true
},
2: {
fill: 'blue',
underline: true,
linethrough: true
},
3: {
fill: 'yellow',
underline: true,
linethrough: true
},
},
}
});
var itext2 = new fabric.Text('Version 4.2.0', {
left: 105,
top: 4,
fontFamily: 'Helvetica',
fill: 'blue',
lineHeight: 1.1,
styles: {
0: {
0: {
underline: true,
linethrough: true
},
1: {
fill: 'red',
underline: true,
linethrough: true
},
2: {
fill: 'red',
underline: true,
linethrough: true
},
3: {
fill: 'red',
underline: true,
linethrough: true
},
4: {
fill: 'red',
underline: true,
linethrough: true
},
5: {
fill: 'red',
underline: true,
linethrough: true
},
6: {
fill: 'red',
underline: true,
linethrough: true
},
},
}
});
canvas.add(itext);
canvas.add(itext2);
canvas.renderAll();
callback(canvas.lowerCanvasEl);
}

tests.push({
test: 'Text and underline color',
code: text11,
width: 350,
height: 100,
golden: 'text11.png',
percentage: 0.01,
});

tests.forEach(visualTestLoop(QUnit));
})();