From 43b1ae85c7cd2874e75720963492572c619ff849 Mon Sep 17 00:00:00 2001
From: Paul Kaplan <pkaplan@media.mit.edu>
Date: Tue, 27 Nov 2018 14:59:39 -0500
Subject: [PATCH] Call renderer.draw after project loads to show the initial
state
---
src/containers/stage.jsx | 6 ++++++
src/lib/vm-manager-hoc.jsx | 11 +++++++++++
2 files changed, 17 insertions(+)
diff --git a/src/containers/stage.jsx b/src/containers/stage.jsx
index 888dfa1c6..077006fcc 100644
--- a/src/containers/stage.jsx
+++ b/src/containers/stage.jsx
@@ -59,6 +59,12 @@ class Stage extends React.Component {
this.canvas = document.createElement('canvas');
this.renderer = new Renderer(this.canvas);
this.props.vm.attachRenderer(this.renderer);
+
+ // Calling draw a single time before any project is loaded just makes
+ // the canvas white instead of solid black–needed because it is not
+ // possible to use CSS to style the canvas to have a different
+ // default color
+ this.props.vm.renderer.draw();
}
this.props.vm.attachV2SVGAdapter(new V2SVGAdapter());
this.props.vm.attachV2BitmapAdapter(new V2BitmapAdapter());
diff --git a/src/lib/vm-manager-hoc.jsx b/src/lib/vm-manager-hoc.jsx
index cbbf10385..981fe8326 100644
--- a/src/lib/vm-manager-hoc.jsx
+++ b/src/lib/vm-manager-hoc.jsx
@@ -53,6 +53,17 @@ const vmManagerHOC = function (WrappedComponent) {
return this.props.vm.loadProject(this.props.projectData)
.then(() => {
this.props.onLoadedProject(this.props.loadingState, this.props.canSave);
+
+ // If the vm is not running, call draw on the renderer manually
+ // This draws the state of the loaded project with no blocks running
+ // which closely matches the 2.0 behavior, except for monitors–
+ // 2.0 runs monitors and shows updates (e.g. timer monitor)
+ // before the VM starts running other hat blocks.
+ if (!this.props.isStarted) {
+ // Wrap in a setTimeout because skin loading in
+ // the renderer can be async.
+ setTimeout(() => this.props.vm.renderer.draw());
+ }
})
.catch(e => {
this.props.onError(e);
--
GitLab