Fixes to the Edit Interface

decode-detroit · Nov 28, 2022 · 9eddebf · 9eddebf
1 parent 21921b6
commit 9eddebf
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ Quickly configure and control an interactive show, no programming experience nec
 
 ## Getting Started
 
-If you're on a 64-bit GNU/Linux system, you can use the the [binary release here](https://github.com/decode-detroit/minerva/releases) and skip down to [Installing Extras](#Installing-Extras) below.
+If you're on a 64-bit GNU/Linux system or 32-bit Raspberry Pi, you can use the the [binary release here](https://github.com/decode-detroit/minerva/releases) and skip down to [Installing Extras](#Installing-Extras) below.
 
 If you're on Windows or Mac, binaries are still a work in progress.
 

diff --git a/web_edit_src/src/components/Actions.js b/web_edit_src/src/components/Actions.js
@@ -590,7 +590,7 @@ export class CueEvent extends React.PureComponent {
     }
 
     // Update the event delay, if it changed
-    if (this.props.cueEvent.event.delay && (this.props.cueEvent.event.delay.secs !== prevProps.cueEvent.event.delay.secs || this.props.cueEvent.event.delay.nanos !== prevProps.cueEvent.event.delay.nanos)) {
+    if (this.props.cueEvent.event.delay && (!prevProps.cueEvent.event.delay || (this.props.cueEvent.event.delay.secs !== prevProps.cueEvent.event.delay.secs || this.props.cueEvent.event.delay.nanos !== prevProps.cueEvent.event.delay.nanos))) {
       this.setState({
         delay: this.props.cueEvent.event.delay.secs + (this.props.cueEvent.event.delay.nanos / 1000000000),
       })

diff --git a/web_edit_src/src/components/EditArea.js b/web_edit_src/src/components/EditArea.js
@@ -330,12 +330,19 @@ export class ViewArea extends React.PureComponent {
 
   // Render the edit area inside the viewbox
   render() {
+    // Add the scene to the list, if it doesn't already exist
+    let idList = this.state.idList;
+    if (idList.indexOf(this.state.sceneId) < 0) {
+      idList = [this.state.sceneId, ...this.state.idList];
+    }
+
+    // Render the result
     return (
       <>
         <SceneMenu value={this.state.sceneId} changeScene={this.changeScene} saveModifications={this.props.saveModifications} />
         <div className="viewArea" onContextMenu={this.showContextMenu}>
           {this.state.sceneId !== -1 && <>
-            <EditArea id={this.state.sceneId} idList={this.state.idList} focusId={this.state.focusId} top={this.state.top} left={this.state.left} zoom={this.state.zoom} handleMouseDown={this.handleMouseDown}handleWheel={this.handleWheel} connections={this.state.connections} grabFocus={this.grabFocus} createConnector={this.createConnector} changeScene={this.changeScene} removeItem={this.removeItemFromScene} saveModifications={this.props.saveModifications} saveLocation={this.saveLocation} />
+            <EditArea id={this.state.sceneId} idList={idList} focusId={this.state.focusId} top={this.state.top} left={this.state.left} zoom={this.state.zoom} handleMouseDown={this.handleMouseDown}handleWheel={this.handleWheel} connections={this.state.connections} grabFocus={this.grabFocus} createConnector={this.createConnector} changeScene={this.changeScene} removeItem={this.removeItemFromScene} saveModifications={this.props.saveModifications} saveLocation={this.saveLocation} />
             {this.state.isMenuVisible && <AddMenu left={this.state.cursorX} top={this.state.cursorY} addItem={this.addItemToScene} saveModifications={this.props.saveModifications}/>}
           </>}
         </div>