fixed a watcher positioning bug when saving / loading a project into a scaled stage

HISTORY.md

@@ -25,7 +25,8 @@
     * fixed relabelling "sum", "product", "minimum" and "maximum" reporters
     * fixed relabelling local custom blocks to global ones and vice-versa
     * fixed library blocks preview to deal with both local and global blocks
-    * fixed scope of script vars inside experimental JIT-compiled rings, thanks, xBZZZ! 
+    * fixed scope of script vars inside experimental JIT-compiled rings, thanks, xBZZZ!
+    * fixed a "wandering" watcher positioning bug when saving / loading a project into a scaled stage
     * fixed an edge case for slot type inferral
     * fixed variadic AND/OR reporters library, thanks, Brian!
     * fixed a pen-size issue in the frequency distribution analysis' graph-plot block, thanks, Brian!
@@ -45,6 +46,7 @@
 * MQTT library update, thanks, Simon!
 * gui: library import dialog make-over for custom categories and hidden blocks, thanks, Michael!
 * extensions: restore presentation mode when using the extension prim to change languages
+* store: fixed a watcher positioning bug when saving / loading a project into a scaled stage 
 
 ### 2022-04-04
 * objects: added speech-balloon-value-association support for ASK menu items

snap.html

@@ -30,7 +30,7 @@
         <script src="src/maps.js?version=2021-06-15"></script>
         <script src="src/extensions.js?version=2022-04-05"></script>
         <script src="src/xml.js?version=2021-07-05"></script>
-        <script src="src/store.js?version=2022-03-22"></script>
+        <script src="src/store.js?version=2022-04-05"></script>
         <script src="src/locale.js?version=2022-03-31"></script>
         <script src="src/cloud.js?version=2021-02-04"></script>
         <script src="src/api.js?version=2022-04-05"></script>

src/store.js

@@ -63,7 +63,7 @@ Project*/
 
 // Global stuff ////////////////////////////////////////////////////////
 
-modules.store = '2022-March-22';
+modules.store = '2022-April-05';
 
 // XML_Serializer ///////////////////////////////////////////////////////
 /*
@@ -635,7 +635,7 @@ SnapSerializer.prototype.loadScene = function (xmlNode, remixID) {
             scene.stage.topLeft().add(new Point(
                 +model.attributes.x || 0,
                 +model.attributes.y || 0
-            ))
+            )).multiplyBy(scene.stage.scale)
         );
         scene.stage.add(watcher);
         watcher.onNextStep = function () {this.currentValue = null; };
@@ -2039,8 +2039,10 @@ WatcherMorph.prototype.toXML = function (serializer) {
         isList = this.currentValue instanceof List,
         color = this.readoutColor,
         position = this.parent ?
-                this.topLeft().subtract(this.parent.topLeft())
-                : this.topLeft();
+                this.topLeft().subtract(
+                    this.parent.topLeft()
+                ).divideBy(this.parent.scale)
+            : this.topLeft();
 
     if (this.isTemporary()) {
         // do not save watchers on temporary variables