Formatting and bug fixes

Author: graham-trott

iwsy/iwsy.js

@@ -326,7 +326,7 @@ const IWSY = (playerElement, scriptObject) => {
 			}
 			if (!vfx.continueFlag) {
 				if (script.runMode === `manual`) {
-					enterManualMode(step);
+					enterManualMode(vfx.step);
 				} else {
 					vfx.step.next();
 				}
@@ -360,6 +360,7 @@ const IWSY = (playerElement, scriptObject) => {
 					block.element.style.display = `none`;
 				}
 			}
+			step.next();
 		} else {
 			for (const block of stepBlocks)
 			{
@@ -494,9 +495,17 @@ const IWSY = (playerElement, scriptObject) => {
 					}
 				};
 				delete(vfx.start);
-				requestAnimationFrame(timestamp => {
-					animatePanzoom(timestamp, vfx);
-				});
+				if (script.speed === `scan`) {
+					vfx.image.style.width = `${vfx.w2}px`;
+					vfx.image.style.height = `${vfx.h2}px`;
+					vfx.image.style.left = `${vfx.xoff2}px`;
+					vfx.image.style.top = `${vfx.yoff2}px`;
+					step.next();
+				} else {
+					requestAnimationFrame(timestamp => {
+						animatePanzoom(timestamp, vfx);
+					});
+				}
 				break;
 			}
 		} 
@@ -505,7 +514,7 @@ const IWSY = (playerElement, scriptObject) => {
 		}
 	};
 
-	// Animate blocks
+	// Animate a block
 	const animate = step => {
 		let continueFlag = true;
 		for (const block of script.blocks) {

iwsy/resources/ecs/blocks.txt

@@ -2,8 +2,9 @@
 
 	script Blocks
 
-    import div Panel and variable Presentation
+    import div Container and variable Presentation
 
+    div Panel
     div Editor
     div Title
     div Table
@@ -58,9 +59,11 @@ Start:
 
 Restart:
 	put property `blocks` of Presentation into Blocks
-	clear Panel
+    clear Container
+    create Panel in Container
+    set the style of Panel to `height:100%;display:flex;flex-direction:column`
     create Row in Panel
-    set the style of Row to `display:flex`
+    set the style of Row to `height:2em;display:flex`
     create Title in Row
     set the style of Title to
     	`flex:1;font-size:110%;font-weight:bold;background:lightgray;text-align:center;margin-bottom:0.5em`
@@ -99,7 +102,7 @@ Restart:
         set the elements of DeleteBlock to NBlocks
     end
     create Table in Panel
-    set the style of Table to `width:100%`
+    set the style of Table to `flex:1;width:100%;overflow-y:scroll`
     put 0 into N
     while N is less than NBlocks
     begin

iwsy/resources/ecs/content.txt

@@ -2,8 +2,9 @@
 
 	script Content
 
-    import div Panel and variable Presentation
+    import div Container and variable Presentation
 
+    div Panel
     div Editor
     div Title
     div Table
@@ -57,9 +58,11 @@ Restart:
     	add 1 to N
     end
 
-	clear Panel
+    clear Container
+    create Panel in Container
+    set the style of Panel to `height:100%;display:flex;flex-direction:column`
     create Row in Panel
-    set the style of Row to `display:flex`
+    set the style of Row to `height:2em;display:flex`
     create Title in Row
     set the style of Title to
     	`flex:1;font-size:110%;font-weight:bold;background:lightgray;text-align:center;margin-bottom:0.5em`
@@ -93,7 +96,7 @@ Restart:
         set the elements of TextArea to NumItems
     end
     create Table in Panel
-    set the style of Table to `width:100%`
+    set the style of Table to `flex:1;width:100%;overflow-y:scroll`
     put 0 into N
     while N is less than NumItems
     begin
@@ -109,7 +112,7 @@ Restart:
         create Cell in Row
         set the style of Cell to `width:100%;display:flex`
         create EditButton in Cell
-        set the style of EditButton to `flex:1`
+        set the style of EditButton to `height:2em;flex:1`
         set the text of EditButton to ItemName
         if N is 0
         begin