CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2026-01-09 18:10:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes setting border and updating shadow color

Browse Source
This commit is contained in:
alschmiedt
2018-12-18 10:57:20 -08:00
parent 5ba66a3418
commit 2fa7ab2825
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/block_svg.js
View File

@@ -899,7 +899,7 @@ Blockly.BlockSvg.prototype.updateColour = function() {
var rgb = goog.color.hexToRgb(hexColour);
if (this.isShadow()) {
hexColour = this.setShadowColour_(rgb, hexColour, secondaryColour);
hexColour = this.setShadowColour_(rgb, secondaryColour);
} else {
this.setBorderColour_(rgb, tertiaryColour);
}
@@ -936,21 +936,25 @@ Blockly.BlockSvg.prototype.setBorderColour_ = function(rgb, tertiaryColour) {
var hexDark = goog.color.rgbArrayToHex(goog.color.darken(rgb, 0.2));
this.svgPathLight_.setAttribute('stroke', hexLight);
this.svgPathDark_.setAttribute('fill', hexDark);
this.svgPath_.setAttribute('stroke', 'none');
}
};
/**
* Sets the colour of shadow blocks.
* @param {string} hexColour Primary colour of the block.
* @param {string} rgb Primary colour of the block.
* @param {string} secondaryColour Colour for shadow block.
* @return {string} hexColour The background color of the block.
*/
Blockly.BlockSvg.prototype.setShadowColour_ = function(
rgb, hexColour, secondaryColour) {
rgb, secondaryColour) {
var hexColour;
if (secondaryColour) {
this.svgPathLight_.style.display = 'none';
this.svgPathDark_.setAttribute('fill', secondaryColour);
this.svgPathDark_.style.display = 'none';
this.svgPath_.setAttribute('fill', secondaryColour);
hexColour = secondaryColour;
} else {
rgb = goog.color.lighten(rgb, 0.6);
hexColour = goog.color.rgbArrayToHex(rgb);
@@ -959,6 +963,7 @@ Blockly.BlockSvg.prototype.setShadowColour_ = function(
}
return hexColour;
};
/**
* Enable or disable a block.
*/