mirror of
https://github.com/scratchfoundation/scratch-paint.git
synced 2024-12-23 05:52:42 -05:00
Remove transparent to transparent gradients. Hide the second color of stroke width 0 gradients again.
This commit is contained in:
parent
35749e5b37
commit
544d833b53
1 changed files with 13 additions and 1 deletions
|
@ -465,11 +465,23 @@ const getColorsFromSelection = function (selectedItems, bitmapMode) {
|
||||||
|
|
||||||
let strokeColorString = primary;
|
let strokeColorString = primary;
|
||||||
const strokeColor2String = secondary;
|
const strokeColor2String = secondary;
|
||||||
const strokeGradientType = gradientType;
|
let strokeGradientType = gradientType;
|
||||||
|
|
||||||
|
if (strokeGradientType !== GradientTypes.SOLID &&
|
||||||
|
item.strokeColor.gradient.stops.length === 2 &&
|
||||||
|
item.strokeColor.gradient.stops[0].color.alpha === 0 &&
|
||||||
|
item.strokeColor.gradient.stops[1].color.alpha === 0) {
|
||||||
|
// Clear the gradient if both colors are transparent
|
||||||
|
item.strokeColor = null;
|
||||||
|
strokeGradientType = GradientTypes.SOLID;
|
||||||
|
}
|
||||||
|
|
||||||
// If the item's stroke width is 0, pretend the stroke color is null
|
// If the item's stroke width is 0, pretend the stroke color is null
|
||||||
if (!item.strokeWidth) {
|
if (!item.strokeWidth) {
|
||||||
strokeColorString = null;
|
strokeColorString = null;
|
||||||
|
// Hide the second color. This way if you choose a second color, remove
|
||||||
|
// the gradient, and re-add it, your second color selection is preserved.
|
||||||
|
strokeGradientType = GradientTypes.SOLID;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Stroke color is fill color in bitmap
|
// Stroke color is fill color in bitmap
|
||||||
|
|
Loading…
Reference in a new issue