scratchfoundation/scratch-paint
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-paint.git synced 2024-12-22 21:42:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Cut off text2 (#744)

Browse source
This commit is contained in:
DD Liu 2018-10-29 11:01:53 -04:00 committed by GitHub
parent edb70f9ca2
commit 4bc3b5b624
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/helper/bitmap.js
View file

@ -369,7 +369,7 @@ const convertToBitmap = function (clearSelectedItems, onUpdateImage) {
// Export svg
const guideLayers = hideGuideLayers(true /* includeRaster */);
const bounds = paper.project.activeLayer.bounds;
const bounds = paper.project.activeLayer.drawnBounds;
const svg = paper.project.exportSVG({
bounds: 'content',
matrix: new paper.Matrix().translate(-bounds.x, -bounds.y)

2
src/helper/tools/text-tool.js
View file

@ -386,7 +386,7 @@ class TextTool extends paper.Tool {
if (!this.textBox || !this.textBox.parent) return;
// @todo get crisp text https://github.com/LLK/scratch-paint/issues/508
const textRaster = this.textBox.rasterize(72, false /* insert */);
const textRaster = this.textBox.rasterize(72, false /* insert */, this.textBox.drawnBounds);
this.textBox.remove();
this.textBox = null;
getRaster().drawImage(

9
src/hocs/update-image-hoc.jsx
View file

@ -59,7 +59,7 @@ const UpdateImageHOC = function (WrappedComponent) {
}
// Anything that is selected is on the vector layer waiting to be committed to the bitmap layer.
// Plaster the selection onto the raster layer before exporting, if there is a selection.
const plasteredRaster = getRaster().getSubRaster(getRaster().bounds);
const plasteredRaster = getRaster().getSubRaster(getRaster().bounds); // Clone the raster layer
plasteredRaster.remove(); // Don't insert
const selectedItems = getSelectedLeafItems();
if (selectedItems.length === 1) {
@ -80,10 +80,11 @@ const UpdateImageHOC = function (WrappedComponent) {
} else if (item instanceof paper.Shape && item.type === 'ellipse') {
commitOvalToBitmap(item, plasteredRaster);
} else if (item instanceof paper.PointText) {
const textRaster = item.rasterize(72, false /* insert */);
const bounds = item.drawnBounds;
const textRaster = item.rasterize(72, false /* insert */, bounds);
plasteredRaster.drawImage(
textRaster.canvas,
new paper.Point(Math.floor(textRaster.bounds.x), Math.floor(textRaster.bounds.y))
new paper.Point(Math.floor(bounds.x), Math.floor(bounds.y))
);
}
}
@ -103,7 +104,7 @@ const UpdateImageHOC = function (WrappedComponent) {
// Export at 0.5x
scaleWithStrokes(paper.project.activeLayer, .5, new paper.Point());
const bounds = paper.project.activeLayer.bounds;
const bounds = paper.project.activeLayer.drawnBounds;
// @todo (https://github.com/LLK/scratch-paint/issues/445) generate view box
this.props.onUpdateImage(
true /* isVector */,