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

Merge pull request #51 from fsih/fixImport

Browse source 
Fix import
This commit is contained in:
DD Liu 2017-10-12 11:26:14 -04:00 committed by GitHub
commit e79faa79d1
1 changed files with 36 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
src/containers/paper-canvas.jsx
View file

@ -34,39 +34,43 @@ class PaperCanvas extends React.Component {
paper.remove(); paper.remove();
} }
importSvg (svg, rotationCenterX, rotationCenterY) { importSvg (svg, rotationCenterX, rotationCenterY) {
const imported = paper.project.importSVG(svg, paper.project.importSVG(svg, {
{ expandShapes: true,
expandShapes: true, onLoad: function (item) {
onLoad: function (item) { const itemWidth = item.bounds.width;
// Remove viewbox const itemHeight = item.bounds.height;
if (item.clipped) {
let mask;
for (const child of item.children) {
if (child.isClipMask()) {
mask = child;
break;
}
}
item.clipped = false;
mask.remove();
// Consider removing clip mask here?
}
while (item.reduce() !== item) {
item = item.reduce();
}
}
});
if (typeof rotationCenterX !== 'undefined' && typeof rotationCenterY !== 'undefined') {
imported.position =
paper.project.view.center
.add(imported.bounds.width / 2, imported.bounds.height / 2)
.subtract(rotationCenterX, rotationCenterY);
} else {
// Center
imported.position = paper.project.view.center;
}
paper.project.view.update(); // Remove viewbox
if (item.clipped) {
let mask;
for (const child of item.children) {
if (child.isClipMask()) {
mask = child;
break;
}
}
item.clipped = false;
mask.remove();
}
// Reduce single item nested in groups
if (item.children && item.children.length === 1) {
item = item.reduce();
}
if (typeof rotationCenterX !== 'undefined' && typeof rotationCenterY !== 'undefined') {
item.position =
paper.project.view.center
.add(itemWidth / 2, itemHeight / 2)
.subtract(rotationCenterX, rotationCenterY);
} else {
// Center
item.position = paper.project.view.center;
}
paper.project.view.update();
}
});
} }
setCanvas (canvas) { setCanvas (canvas) {
this.canvas = canvas; this.canvas = canvas;