fix on start color

microsoft · Apr 16, 2024 · cdec653 · cdec653
1 parent efe635d
commit cdec653
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/pxtblocks/builtins/misc.ts b/pxtblocks/builtins/misc.ts
@@ -8,6 +8,12 @@ export function initOnStart() {
     const onStartDef = pxt.blocks.getBlockDefinition(ts.pxtc.ON_START_TYPE);
     Blockly.Blocks[ts.pxtc.ON_START_TYPE] = {
         init: function () {
+            let colorOverride = pxt.appTarget.runtime?.onStartColor;
+
+            if (colorOverride) {
+                colorOverride = pxt.toolbox.getAccessibleBackground(colorOverride);
+            }
+
             this.jsonInit({
                 "message0": onStartDef.block["message0"],
                 "args0": [
@@ -19,15 +25,15 @@ export function initOnStart() {
                         "name": "HANDLER"
                     }
                 ],
-                "colour": (pxt.appTarget.runtime ? pxt.appTarget.runtime.onStartColor : '') || pxt.toolbox.getNamespaceColor('loops')
+                "colour": colorOverride || pxt.toolbox.getNamespaceColor('loops')
             });
 
             setHelpResources(this,
                 ts.pxtc.ON_START_TYPE,
                 onStartDef.name,
                 onStartDef.tooltip,
                 onStartDef.url,
-                String((pxt.appTarget.runtime ? pxt.appTarget.runtime.onStartColor : '') || pxt.toolbox.getNamespaceColor('loops')),
+                colorOverride || pxt.toolbox.getNamespaceColor('loops'),
                 undefined, undefined,
                 pxt.appTarget.runtime ? pxt.appTarget.runtime.onStartUnDeletable : false
             );