fixed webcam calibrate bug and target screen styling

dbecker1 · Apr 1, 2020 · f1476b2 · f1476b2
1 parent 7498d45
commit f1476b2
Show file tree

Hide file tree

Showing 4 changed files with 73 additions and 85 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/src/components/ProjectorScreen.js b/src/components/ProjectorScreen.js
@@ -47,7 +47,7 @@ class ProjectorScreenInner extends React.Component {
                             <h1>Put this screen on your projector!</h1>
                             <h3>Resize the window to take the full screen and then click the button below</h3>
                             <p>Height: {this.state.height}<br />Width: {this.state.width}</p>
-                            <Button onClick={() => {this.doneResizing()}}>I'm done resizing!</Button>
+                            <Button variant="customPrimary" onClick={() => {this.doneResizing()}}>I'm done resizing!</Button>
                         </Col>
                     </Row>
             );
@@ -119,7 +119,7 @@ class ProjectorScreen extends React.Component {
     render() {
         return (
             <NewWindow ref={this.windowRef} name={WINDOW_NAME}>
-                <div style={{ height: "100vh", width: "100vw"}}>
+                <div style={{ height: "100vh", width: "100vw", backgroundColor: backgroundColor, color: color}}>
                     <ProjectorScreenInner height={this.state.height} width={this.state.width} targetScreenManager={this.props.targetScreenManager} onResizeFinish={this.props.onResizeFinish}/>
                 </div>
             </NewWindow>

diff --git a/src/components/pages/CalibrateWebcam.js b/src/components/pages/CalibrateWebcam.js
@@ -44,6 +44,7 @@ class CalibrateWebcam extends React.Component {
 
     finishCalibrating() {
         cookie.save("webcamConfig", {corners: this.calibrator.getCorners()})
+        this.props.targetScreenManager.wipeScreen();
         this.props.changePage("welcome")
     }
 

diff --git a/src/util/WebcamCalibrator.js b/src/util/WebcamCalibrator.js
@@ -15,11 +15,11 @@ class WebcamCalibrator {
 
         if (!!existingCorners) {
             this.corners = existingCorners;
+            this.currentCorner = 5;
         } else {
             this.corners = [{}, {}, {}, {}];
+            this.currentCorner = 0;
         }
-
-        this.currentCorner = 5;
     }
 
     start() {