Scalable Comments, auto-positioning scaled scripts

including support for auto-positioning scaled scripts (so you don't
have to clean-up when scaling blocks)

1 files changed, 30 insertions, 23 deletions

diff --git a/store.js b/store.js
index efd9d3b..2dc43ca 100644
--- a/store.js
+++ b/store.js
@@ -56,11 +56,12 @@ detect, CustomCommandBlockMorph, CustomReporterBlockMorph, Color, List,
 newCanvas, Costume, Sound, Audio, IDE_Morph, ScriptsMorph, BlockMorph,
 ArgMorph, InputSlotMorph, TemplateSlotMorph, CommandSlotMorph,
 FunctionSlotMorph, MultiArgMorph, ColorSlotMorph, nop, CommentMorph, isNil,
-localize, sizeOf, ArgLabelMorph, SVG_Costume, MorphicPreferences*/
+localize, sizeOf, ArgLabelMorph, SVG_Costume, MorphicPreferences,
+SyntaxElementMorph*/
 
 // Global stuff ////////////////////////////////////////////////////////
 
-modules.store = '2013-March-14';
+modules.store = '2013-March-19';
 
 
 // XML_Serializer ///////////////////////////////////////////////////////
@@ -702,7 +703,8 @@ SnapSerializer.prototype.populateCustomBlocks = function (
 
 SnapSerializer.prototype.loadScripts = function (scripts, model) {
     // private
-    var myself = this;
+    var myself = this,
+        scale = SyntaxElementMorph.prototype.scale;
     scripts.texture = 'scriptsPaneTexture.gif';
     model.children.forEach(function (child) {
         var element;
@@ -712,8 +714,8 @@ SnapSerializer.prototype.loadScripts = function (scripts, model) {
                 return;
             }
             element.setPosition(new Point(
-                +child.attributes.x || 0,
-                +child.attributes.y || 0
+                (+child.attributes.x || 0) * scale,
+                (+child.attributes.y || 0) * scale
             ).add(scripts.topLeft()));
             scripts.add(element);
             element.fixBlockColor(null, true); // force zebra coloring
@@ -726,8 +728,8 @@ SnapSerializer.prototype.loadScripts = function (scripts, model) {
                 return;
             }
             element.setPosition(new Point(
-                +child.attributes.x || 0,
-                +child.attributes.y || 0
+                (+child.attributes.x || 0) * scale,
+                (+child.attributes.y || 0) * scale
             ).add(scripts.topLeft()));
             scripts.add(element);
         }
@@ -737,6 +739,7 @@ SnapSerializer.prototype.loadScripts = function (scripts, model) {
 SnapSerializer.prototype.loadScriptsArray = function (model) {
     // private - answer an array containting the model's scripts
     var myself = this,
+        scale = SyntaxElementMorph.prototype.scale,
         scripts = [];
     model.children.forEach(function (child) {
         var element;
@@ -746,8 +749,8 @@ SnapSerializer.prototype.loadScriptsArray = function (model) {
                 return;
             }
             element.setPosition(new Point(
-                +child.attributes.x || 0,
-                +child.attributes.y || 0
+                (+child.attributes.x || 0) * scale,
+                (+child.attributes.y || 0) * scale
             ));
             scripts.push(element);
             element.fixBlockColor(null, true); // force zebra coloring
@@ -757,8 +760,8 @@ SnapSerializer.prototype.loadScriptsArray = function (model) {
                 return;
             }
             element.setPosition(new Point(
-                +child.attributes.x || 0,
-                +child.attributes.y || 0
+                (+child.attributes.x || 0) * scale,
+                (+child.attributes.y || 0) * scale
             ));
             scripts.push(element);
         }
@@ -787,9 +790,10 @@ SnapSerializer.prototype.loadScript = function (model) {
 
 SnapSerializer.prototype.loadComment = function (model) {
     // private
-    var comment = new CommentMorph(model.contents);
+    var comment = new CommentMorph(model.contents),
+        scale = SyntaxElementMorph.prototype.scale;
     comment.isCollapsed = (model.attributes.collapsed === 'true');
-    comment.setTextWidth(+model.attributes.w);
+    comment.setTextWidth(+model.attributes.w * scale);
     return comment;
 };
 
@@ -1369,6 +1373,7 @@ BlockMorph.prototype.toXML = BlockMorph.prototype.toScriptXML = function (
 ) {
     var position,
         xml,
+        scale = SyntaxElementMorph.prototype.scale,
         block = this;
 
     // determine my position
@@ -1382,8 +1387,8 @@ BlockMorph.prototype.toXML = BlockMorph.prototype.toScriptXML = function (
     if (savePosition) {
         xml = serializer.format(
             '<script x="@" y="@">',
-            position.x,
-            position.y
+            position.x / scale,
+            position.y / scale
         );
     } else {
         xml = '<script>';
@@ -1418,7 +1423,8 @@ ReporterBlockMorph.prototype.toScriptXML = function (
     serializer,
     savePosition
 ) {
-    var position;
+    var position,
+        scale = SyntaxElementMorph.prototype.scale;
 
     // determine my save-position
     if (this.parent) {
@@ -1430,8 +1436,8 @@ ReporterBlockMorph.prototype.toScriptXML = function (
     if (savePosition) {
         return serializer.format(
             '<script x="@" y="@">%</script>',
-            position.x,
-            position.y,
+            position.x / scale,
+            position.y / scale,
             this.toXML(serializer)
         );
     }
@@ -1613,12 +1619,13 @@ Context.prototype.toXML = function (serializer) {
 // Comments
 
 CommentMorph.prototype.toXML = function (serializer) {
-    var position;
+    var position,
+        scale = SyntaxElementMorph.prototype.scale;
 
     if (this.block) { // attached to a block
         return serializer.format(
             '<comment w="@" collapsed="@">%</comment>',
-            this.textWidth(),
+            this.textWidth() / scale,
             this.isCollapsed,
             serializer.escape(this.text())
         );
@@ -1632,9 +1639,9 @@ CommentMorph.prototype.toXML = function (serializer) {
     }
     return serializer.format(
         '<comment x="@" y="@" w="@" collapsed="@">%</comment>',
-        position.x,
-        position.y,
-        this.textWidth(),
+        position.x / scale,
+        position.y / scale,
+        this.textWidth() / scale,
         this.isCollapsed,
         serializer.escape(this.text())
     );