mirror of
https://github.com/scratchfoundation/scratch-paint.git
synced 2024-12-22 21:42:30 -05:00
Merge branch 'develop' into fillSpace
This commit is contained in:
commit
2cb1f1a62d
1 changed files with 2 additions and 1 deletions
|
@ -91,10 +91,11 @@ class FillColorIndicator extends React.Component {
|
|||
}
|
||||
handleSwap () {
|
||||
if (getSelectedLeafItems().length) {
|
||||
swapColorsInSelection(
|
||||
const isDifferent = swapColorsInSelection(
|
||||
isBitmap(this.props.format),
|
||||
this.props.textEditTarget);
|
||||
this.props.setSelectedItems();
|
||||
this._hasChanged = this._hasChanged || isDifferent;
|
||||
} else {
|
||||
let color1 = this.props.fillColor;
|
||||
let color2 = this.props.fillColor2;
|
||||
|
|
Loading…
Reference in a new issue