scratchfoundation/scratch-blocks
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-blocks.git synced 2025-08-28 22:10:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1125 from rachel-fenichel/bugfix/argument_reporter_color

Browse source 
Make shadow argument reporters pop out visually
This commit is contained in:
Rachel Fenichel 2017-10-10 13:34:44 -07:00 • committed by GitHub
commit 44e561c7a6
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
core/block_render_svg_vertical.js
View file

@ -27,6 +27,7 @@
goog.provide('Blockly.BlockSvg.render');
goog.require('Blockly.BlockSvg');
goog.require('Blockly.utils');
// UI constants for rendering blocks.
@ -490,7 +491,10 @@ Blockly.BlockSvg.DEFINE_BLOCK_TYPE = 'procedures_defnoreturn';
*/
Blockly.BlockSvg.prototype.updateColour = function() {
var strokeColour = this.getColourTertiary();
if (this.isShadow() && this.parentBlock_) {
var renderShadowed =
this.isShadow() && !Blockly.utils.isShadowArgumentReporter(this);
if (renderShadowed && this.parentBlock_) {
// Pull shadow block stroke colour from parent block's tertiary if possible.
strokeColour = this.parentBlock_.getColourTertiary();
// Special case: if we contain a colour field, set to a special stroke colour.
@ -506,8 +510,11 @@ Blockly.BlockSvg.prototype.updateColour = function() {
this.svgPath_.setAttribute('stroke', strokeColour);
// Render block fill
var fillColour = (this.isGlowingBlock_ || this.isShadow()) ?
this.getColourSecondary() : this.getColour();
if (this.isGlowingBlock_ || renderShadowed) {
var fillColour = this.getColourSecondary();
} else {
var fillColour = this.getColour();
}
this.svgPath_.setAttribute('fill', fillColour);
// Render opacity