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 #922 from adroitwhiz/swapcolorsinselection-continue

Browse source 
Skip processing of child paths in swapColorsInSelection
This commit is contained in:
adroitwhiz 2020-05-15 20:23:43 -04:00 committed by GitHub
commit b0164e7783
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6,6 +6,7 @@ import {getItems} from './selection';
import GradientTypes from '../lib/gradient-types';
import parseColor from 'parse-color';
import {DEFAULT_COLOR} from '../reducers/fill-color';
import {isCompoundPathChild} from '../helper/compound-path';
const MIXED = 'scratch-paint/style-path/mixed';
@ -159,10 +160,11 @@ const applyFillColorToSelection = function (colorString, colorIndex, isSolidGrad
const swapColorsInSelection = function (bitmapMode, textEditTargetId) {
const items = _getColorStateListeners(textEditTargetId);
let changed = false;
for (let item of items) {
if (item.parent instanceof paper.CompoundPath) {
item = item.parent;
}
for (const item of items) {
// If an item is a child path, do not swap colors.
// At some point, we'll iterate over its parent path, and we don't want to swap colors twice--
// that would leave us right where we started.
if (isCompoundPathChild(item)) continue;
if (bitmapMode) {
// @todo