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

Merge branch 'develop' into fillSpace

Browse source
This commit is contained in:
DD Liu 2020-05-14 14:21:35 -04:00
commit 2cb1f1a62d
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/containers/fill-color-indicator.jsx
View file

@ -91,10 +91,11 @@ class FillColorIndicator extends React.Component {
} }
handleSwap () { handleSwap () {
if (getSelectedLeafItems().length) { if (getSelectedLeafItems().length) {
swapColorsInSelection( const isDifferent = swapColorsInSelection(
isBitmap(this.props.format), isBitmap(this.props.format),
this.props.textEditTarget); this.props.textEditTarget);
this.props.setSelectedItems(); this.props.setSelectedItems();
this._hasChanged = this._hasChanged || isDifferent;
} else { } else {
let color1 = this.props.fillColor; let color1 = this.props.fillColor;
let color2 = this.props.fillColor2; let color2 = this.props.fillColor2;