refactor: use block styles instead of directly specifying block colors #171
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is one of three PRs across scratch-blocks, scratch-gui and scratch-vm that refactor each package to define block colors as Blockly BlockStyles, instead of using the
colourattribute in Block JSON. This has several advantages:colourattribute causes the secondary/tertiary colors to be calculated, and Blockly does so in a way that slightly skews from the colors Scratch specifies. Scratch had previously modified core Blockly to read the secondary/tertiary colors out of the block JSON, but this isn't directly achievable using supported APIs.In addition, these changes fix the coloration of dropdown fields in their various forms to align with Scratch's behavior. The ability for Scratch extensions to specify a custom block color is also preserved, even though that functionality is currently unused.