From 94a5013beb1b1118eebe6347f5fa58b8c35c7833 Mon Sep 17 00:00:00 2001
From: Dariusz Niemczyk <palid@phoelid.me>
Date: Fri, 13 Aug 2021 19:03:20 +0200
Subject: [PATCH] temp

---
 res/themes/dark/css/_dark.scss              |  6 +-
 res/themes/light/css/_light.scss            |  7 +-
 src/components/structures/BackdropPanel.tsx | 71 ++++++++++-----------
 3 files changed, 43 insertions(+), 41 deletions(-)

diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss
index 8c305b9828..53cba6f440 100644
--- a/res/themes/dark/css/_dark.scss
+++ b/res/themes/dark/css/_dark.scss
@@ -239,8 +239,10 @@ $voice-playback-button-fg-color: $message-body-panel-icon-fg-color;
 $appearance-tab-border-color: $room-highlight-color;
 
 // blur amounts for left left panel (only for element theme, used in _mods.scss)
-$roomlist-background-blur-amount: 60px;
-$groupFilterPanel-background-blur-amount: 30px;
+:root {
+    --roomlist-background-blur-amount: 60px;
+    --groupFilterPanel-background-blur-amount: 30px;
+}
 
 $composer-shadow-color: rgba(0, 0, 0, 0.28);
 
diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss
index e64fe12d3b..4978edee55 100644
--- a/res/themes/light/css/_light.scss
+++ b/res/themes/light/css/_light.scss
@@ -362,9 +362,10 @@ $voice-playback-button-fg-color: $message-body-panel-icon-fg-color;
 $appearance-tab-border-color: $input-darker-bg-color;
 
 // blur amounts for left left panel (only for element theme, used in _mods.scss)
-$roomlist-background-blur-amount: 40px;
-$groupFilterPanel-background-blur-amount: 20px;
-
+:root {
+    --roomlist-background-blur-amount: 40px;
+    --groupFilterPanel-background-blur-amount: 20px;
+}
 $composer-shadow-color: rgba(0, 0, 0, 0.04);
 
 // Bubble tiles
diff --git a/src/components/structures/BackdropPanel.tsx b/src/components/structures/BackdropPanel.tsx
index 9f4d639968..1242835450 100644
--- a/src/components/structures/BackdropPanel.tsx
+++ b/src/components/structures/BackdropPanel.tsx
@@ -27,31 +27,21 @@ export default class BackdropPanel extends React.PureComponent<IProps> {
     private spacesCanvasRef = createRef<HTMLCanvasElement>();
     private roomListCanvasRef = createRef<HTMLCanvasElement>();
 
-    private spacesCtx: CanvasRenderingContext2D;
-    private roomListCtx: CanvasRenderingContext2D;
-
     private sizes = {
         spacePanelWidth: 0,
         roomListWidth: 0,
         height: 0,
     };
-    private currentFrame?: number;
+    private style = getComputedStyle(document.documentElement);
 
     constructor(props: IProps) {
         super(props);
     }
 
     public componentDidMount() {
-        this.spacesCtx = this.spacesCanvasRef.current.getContext("2d");
-        this.roomListCtx = this.roomListCanvasRef.current.getContext("2d");
         UIStore.instance.on("SpacePanel", this.onResize);
         UIStore.instance.on("LeftPanel", this.onResize);
-    }
-
-    public componentDidUpdate() {
-        if (this.props.backgroundImage) {
-            this.refreshBackdropImage();
-        }
+        this.onResize();
     }
 
     public componentWillUnmount() {
@@ -59,28 +49,31 @@ export default class BackdropPanel extends React.PureComponent<IProps> {
         UIStore.instance.off("LeftPanel", this.onResize);
     }
 
-    private onResize = () => {
-        const spacePanelDimensions = UIStore.instance.getElementDimensions("SpacePanel");
-        const roomListDimensions = UIStore.instance.getElementDimensions("LeftPanel");
-        this.sizes = {
-            spacePanelWidth: spacePanelDimensions?.width ?? 0,
-            roomListWidth: roomListDimensions?.width ?? 0,
-            height: UIStore.instance.windowHeight,
-        };
+    public componentDidUpdate(prevProps: IProps) {
         if (this.props.backgroundImage) {
+            this.onResize();
+        }
+        if (prevProps.backgroundImage && !this.props.backgroundImage) {
+            this.forceUpdate();
+        }
+    }
+
+    private onResize = () => {
+        if (this.props.backgroundImage) {
+            const spacePanelDimensions = UIStore.instance.getElementDimensions("SpacePanel");
+            const roomListDimensions = UIStore.instance.getElementDimensions("LeftPanel");
+            this.sizes = {
+                spacePanelWidth: spacePanelDimensions?.width ?? 0,
+                roomListWidth: roomListDimensions?.width ?? 0,
+                height: UIStore.instance.windowHeight,
+            };
             this.refreshBackdropImage();
         }
     };
 
-    private animate = () => {
-        if (this.currentFrame !== undefined) {
-            cancelAnimationFrame(this.currentFrame);
-            this.currentFrame = undefined;
-        }
-        this.currentFrame = requestAnimationFrame(this.refreshBackdropImage);
-    };
-
     private refreshBackdropImage = (): void => {
+        const spacesCtx = this.spacesCanvasRef.current.getContext("2d");
+        const roomListCtx = this.roomListCanvasRef.current.getContext("2d");
         const { spacePanelWidth, roomListWidth, height } = this.sizes;
         const width = spacePanelWidth + roomListWidth;
         const { backgroundImage } = this.props;
@@ -111,16 +104,21 @@ export default class BackdropPanel extends React.PureComponent<IProps> {
         this.roomListCanvasRef.current.height = height;
         this.roomListCanvasRef.current.style.transform = `translateX(${spacePanelWidth}px)`;
 
-        this.spacesCtx.filter = `blur(30px)`;
-        this.roomListCtx.filter = `blur(60px)`;
-        this.spacesCtx.drawImage(
+        const spacesBlur = this.style.getPropertyValue('--roomlist-background-blur-amount');
+        const roomListBlur = this.style.getPropertyValue('--groupFilterPanel-background-blur-amount');
+
+        spacesCtx.filter = `blur(${spacesBlur})`;
+        roomListCtx.filter = `blur(${roomListBlur})`;
+        spacesCtx.drawImage(
             backgroundImage,
+            0, 0,
+            imageWidth, imageHeight,
             x,
             y,
             resultWidth,
             resultHeight,
         );
-        this.roomListCtx.drawImage(
+        roomListCtx.drawImage(
             backgroundImage,
             0, 0,
             imageWidth, imageHeight,
@@ -132,22 +130,23 @@ export default class BackdropPanel extends React.PureComponent<IProps> {
     };
 
     public render() {
-        return <>
+        if (!this.props.backgroundImage) return null;
+        return <div>
             <canvas
                 ref={this.spacesCanvasRef}
                 className="mx_BackdropPanel"
                 style={{
-                    opacity: .15,
+                    opacity: .19,
                 }}
             />
             <canvas
                 style={{
                     transform: `translateX(0)`,
-                    opacity: .1,
+                    opacity: .12,
                 }}
                 ref={this.roomListCanvasRef}
                 className="mx_BackdropPanel"
             />
-        </>;
+        </div>;
     }
 }