scratchfoundation/scratch-paint
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-paint.git synced 2025-03-23 03:15:55 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix changing gradient strokes to/from null

Browse source 
Hopefully the comments help; the logic is kinda convoluted here
This commit is contained in:
adroitwhiz 2020-07-16 06:52:39 -04:00
parent 696e35582c
commit f0b1881fb0
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/containers/color-indicator.jsx
View file

@ -43,10 +43,24 @@ const makeColorIndicator = (label, isStroke) => {
// Stroke-selector-specific logic: if we change the stroke color from "none" to something visible, ensure // Stroke-selector-specific logic: if we change the stroke color from "none" to something visible, ensure
// there's a nonzero stroke width. If we change the stroke color to "none", set the stroke width to zero. // there's a nonzero stroke width. If we change the stroke color to "none", set the stroke width to zero.
if (isStroke) { if (isStroke) {
if (this.props.color === null && newColor !== null) {
// Whether the old color style in this color indicator was null (completely transparent).
// If it's a solid color, this means that the first color is null.
// If it's a gradient, this means both colors are null.
const oldStyleWasNull = this.props.gradientType === GradientTypes.SOLID ?
this.props.color === null :
this.props.color === null && this.props.color2 === null;
const otherColor = this.props.colorIndex === 1 ? this.props.color : this.props.color2;
// Whether the new color style in this color indicator is null.
const newStyleIsNull = this.props.gradientType === GradientTypes.SOLID ?
newColor === null :
newColor === null && otherColor === null;
if (oldStyleWasNull && !newStyleIsNull) {
this._hasChanged = applyStrokeWidthToSelection(1, this.props.textEditTarget) || this._hasChanged; this._hasChanged = applyStrokeWidthToSelection(1, this.props.textEditTarget) || this._hasChanged;
this.props.onChangeStrokeWidth(1); this.props.onChangeStrokeWidth(1);
} else if (this.props.color !== null && newColor === null) { } else if (!oldStyleWasNull && newStyleIsNull) {
this._hasChanged = applyStrokeWidthToSelection(0, this.props.textEditTarget) || this._hasChanged; this._hasChanged = applyStrokeWidthToSelection(0, this.props.textEditTarget) || this._hasChanged;
this.props.onChangeStrokeWidth(0); this.props.onChangeStrokeWidth(0);
} }