From fd47df9cb982c9ee6d1e71e65ce407d914f5be6a Mon Sep 17 00:00:00 2001 From: jmoenig Date: Mon, 18 Mar 2013 18:31:12 +0100 Subject: Adjust highlight when modifying active scripts When dragging blocks out of a running script, adding blocks into a running script, or editing inputs of a running script, the script's highlight should now adjust accordingly --- blocks.js | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'blocks.js') diff --git a/blocks.js b/blocks.js index 25e360a..ee5907e 100644 --- a/blocks.js +++ b/blocks.js @@ -557,6 +557,10 @@ SyntaxElementMorph.prototype.reactToGrabOf = function (grabbedMorph) { topBlock.allComments().forEach(function (comment) { comment.align(topBlock); }); + if (topBlock.getHighlight()) { + topBlock.removeHighlight(); + topBlock.addHighlight(); + } } }; @@ -1148,6 +1152,7 @@ SyntaxElementMorph.prototype.fixLayout = function () { 1 : Math.floor(fontHeight(this.fontSize) / 3), bottomCorrection, needsHighlight = false, + top = this.topBlock(), initialExtent = this.extent(); if ((this instanceof MultiArgMorph) && (this.slotSpec !== '%c')) { @@ -1366,6 +1371,12 @@ SyntaxElementMorph.prototype.fixLayout = function () { } } + // fix highlights, if any + if (top.getHighlight()) { + top.removeHighlight(); + top.addHighlight(); + } + // restore highlight: if (needsHighlight) { this.addHighlight(); @@ -2481,6 +2492,14 @@ BlockMorph.prototype.snap = function () { top.allComments().forEach(function (comment) { comment.align(top); }); + // fix highlights, if any + if (this.getHighlight() && (this !== top)) { + this.removeHighlight(); + } + if (top.getHighlight()) { + top.removeHighlight(); + top.addHighlight(); + } }; // CommandBlockMorph /////////////////////////////////////////////////// -- cgit v1.3.1