scratchfoundation/scratch-paint
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-paint.git synced 2025-01-10 22:47:03 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

merge match stroke color and match fill color

Browse source
This commit is contained in:
DD 2017-12-19 13:15:31 -05:00
parent b8c0b29aea
commit 45dea42863
1 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/helper/style-path.js
View file

@ -5,10 +5,14 @@ import {isGroup} from './group';
const MIXED = 'scratch-paint/style-path/mixed';
const _fillColorMatch = function (item, incomingColor) {
return item.fillColor && item.fillColor.type !== 'gradient' && // @todo check whether the gradient has changed
((!item.fillColor && !incomingColor) ||
(item.fillColor && incomingColor && item.fillColor.toCSS() === new paper.Color(incomingColor).toCSS()));
// Check if the item color matches the incoming color. If the item color is a gradient, we assume
// that the incoming color never matches, since we don't support gradients yet.
const _colorMatch = function (itemColor, incomingColor) {
// @todo check whether the gradient has changed when we support gradients
if (itemColor && itemColor.type === 'gradient') return false;
// Either both are null or both are the same color when converted to CSS.
return (!itemColor && !incomingColor) ||
(itemColor && incomingColor && itemColor.toCSS() === new paper.Color(incomingColor).toCSS());
};
/**
@ -25,14 +29,14 @@ const applyFillColorToSelection = function (colorString) {
if (child.children) {
for (const path of child.children) {
if (!path.data.isPGGlyphRect) {
if (!_fillColorMatch(path.fillColor, colorString)) {
if (!_colorMatch(path.fillColor, colorString)) {
changed = true;
path.fillColor = colorString;
}
}
}
} else if (!child.data.isPGGlyphRect) {
if (!_fillColorMatch(child.fillColor, colorString)) {
if (!_colorMatch(child.fillColor, colorString)) {
changed = true;
child.fillColor = colorString;
}
@ -42,7 +46,7 @@ const applyFillColorToSelection = function (colorString) {
if (isPointTextItem(item) && !colorString) {
colorString = 'rgba(0,0,0,0)';
}
if (!_fillColorMatch(item, colorString)) {
if (!_colorMatch(item.fillColor, colorString)) {
changed = true;
item.fillColor = colorString;
}
@ -51,12 +55,6 @@ const applyFillColorToSelection = function (colorString) {
return changed;
};
const _strokeColorMatch = function (item, incomingColor) {
return item.strokeColor && item.strokeColor.type !== 'gradient' && // @todo check whether the gradient has changed
((!item.strokeColor && !incomingColor) ||
(item.strokeColor && incomingColor && item.strokeColor.toCSS() === new paper.Color(incomingColor).toCSS()));
};
/**
* Called when setting stroke color
* @param {string} colorString New color, css format
@ -72,7 +70,7 @@ const applyStrokeColorToSelection = function (colorString) {
if (child.children) {
for (const path of child.children) {
if (!path.data.isPGGlyphRect) {
if (!_strokeColorMatch(path, colorString)) {
if (!_colorMatch(path.strokeColor, colorString)) {
changed = true;
path.strokeColor = colorString;
}
@ -86,12 +84,12 @@ const applyStrokeColorToSelection = function (colorString) {
}
}
} else if (!item.data.isPGGlyphRect) {
if (!_strokeColorMatch(item, colorString)) {
if (!_colorMatch(item.strokeColor, colorString)) {
changed = true;
item.strokeColor = colorString;
}
}
} else if (!_strokeColorMatch(item, colorString)) {
} else if (!_colorMatch(item.strokeColor, colorString)) {
changed = true;
item.strokeColor = colorString;
}