From c80b4ad5476b48c8fdcb58d946ad6a54c1de2ba6 Mon Sep 17 00:00:00 2001
From: Bill <billsonnn@live.com>
Date: Sat, 9 Apr 2022 22:04:17 -0400
Subject: [PATCH] More fixes

---
 src/components/room/RoomColorView.tsx |  6 ++--
 src/components/room/RoomView.tsx      | 44 +++++++++++++++------------
 2 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/src/components/room/RoomColorView.tsx b/src/components/room/RoomColorView.tsx
index 9b693d89..8ca806e9 100644
--- a/src/components/room/RoomColorView.tsx
+++ b/src/components/room/RoomColorView.tsx
@@ -21,12 +21,11 @@ export const RoomColorView: FC<{}> = props =>
 
         if(!hue && !saturation && !lightness)
         {
-            roomBackground.visible = false;
+            roomBackground.tint = 0;
         }
         else
         {
             roomBackground.tint = newColor;
-            roomBackground.visible = true;
         }
     }, [ roomBackground ]);
 
@@ -95,7 +94,6 @@ export const RoomColorView: FC<{}> = props =>
                 if(!roomBackground) return;
 
                 roomBackground.tint = originalRoomBackgroundColor;
-                roomBackground.visible = true;
                 
                 return;
             }
@@ -117,7 +115,7 @@ export const RoomColorView: FC<{}> = props =>
         const filter = new NitroAdjustmentFilter();
         const master = (canvas.master as NitroContainer);
 
-        background.visible = false;
+        background.tint = 0;
         background.width = GetNitroInstance().width;
         background.height = GetNitroInstance().height;
 
diff --git a/src/components/room/RoomView.tsx b/src/components/room/RoomView.tsx
index 1b91a3a8..b30fec81 100644
--- a/src/components/room/RoomView.tsx
+++ b/src/components/room/RoomView.tsx
@@ -52,6 +52,25 @@ export const RoomView: FC<{}> = props =>
     UseRoomSessionManagerEvent(RoomSessionEvent.CREATED, onRoomSessionEvent);
     UseRoomSessionManagerEvent(RoomSessionEvent.ENDED, onRoomSessionEvent);
 
+    const resize = useCallback((event: UIEvent = null) =>
+    {
+        const canvas = GetNitroInstance().renderer.view;
+
+        if(!canvas) return;
+
+        canvas.style.width = `${ Math.floor(window.innerWidth) }px`;
+        canvas.style.height = `${ Math.floor(window.innerHeight) }px`;
+    
+        const nitroInstance = GetNitroInstance();
+
+        nitroInstance.renderer.resolution = window.devicePixelRatio;
+        nitroInstance.renderer.resize(window.innerWidth, window.innerHeight);
+        
+        InitializeRoomInstanceRenderingCanvas(window.innerWidth, window.innerHeight, 1);
+
+        nitroInstance.render();
+    }, []);
+
     useEffect(() =>
     {
         if(!roomSession)
@@ -88,6 +107,9 @@ export const RoomView: FC<{}> = props =>
         const roomEngine = GetRoomEngine();
         const roomId = roomSession.roomId;
         const canvasId = 1;
+
+        resize();
+
         const displayObject = roomEngine.getRoomInstanceDisplay(roomId, canvasId, window.innerWidth, window.innerHeight, RoomGeometry.SCALE_ZOOMED_IN);
 
         if(!displayObject) return;
@@ -121,7 +143,7 @@ export const RoomView: FC<{}> = props =>
         stage.addChild(displayObject);
 
         SetActiveRoomId(roomSession.roomId);
-    }, [ roomSession ]);
+    }, [ roomSession, resize ]);
 
     useEffect(() =>
     {
@@ -139,23 +161,7 @@ export const RoomView: FC<{}> = props =>
         canvas.ontouchend = event => DispatchTouchEvent(event);
         canvas.ontouchcancel = event => DispatchTouchEvent(event);
 
-        canvas.style.width = `${ Math.floor(window.innerWidth) }px`;
-        canvas.style.height = `${ Math.floor(window.innerHeight) }px`;
-
-        const resize = (event: UIEvent) =>
-        {
-            canvas.style.width = `${ Math.floor(window.innerWidth) }px`;
-            canvas.style.height = `${ Math.floor(window.innerHeight) }px`;
-        
-            const nitroInstance = GetNitroInstance();
-
-            nitroInstance.renderer.resolution = window.devicePixelRatio;
-            nitroInstance.renderer.resize(window.innerWidth, window.innerHeight);
-            
-            InitializeRoomInstanceRenderingCanvas(window.innerWidth, window.innerHeight, 1);
-
-            nitroInstance.render();
-        }
+        resize();
 
         const element = elementRef.current;
 
@@ -169,7 +175,7 @@ export const RoomView: FC<{}> = props =>
             
             window.removeEventListener('resize', resize);
         }
-    }, []);
+    }, [ resize ]);
 
     return (
         <RoomContextProvider value={ { roomSession, eventDispatcher: (widgetHandler && widgetHandler.eventDispatcher), widgetHandler } }>