From be2da6376e1c5b3a6be2c23a3bfbe89766e5bbc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Mon, 3 May 2021 17:49:55 +0200
Subject: [PATCH] Simplifie translation code
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 src/components/views/voip/CallPreview.tsx | 25 ++++++++++++-----------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/components/views/voip/CallPreview.tsx b/src/components/views/voip/CallPreview.tsx
index 74d43dcb19..9a9ebd5e92 100644
--- a/src/components/views/voip/CallPreview.tsx
+++ b/src/components/views/voip/CallPreview.tsx
@@ -126,8 +126,6 @@ export default class CallPreview extends React.Component<IProps, IState> {
 
     private initX = 0;
     private initY = 0;
-    private lastX = DEFAULT_X_OFFSET;
-    private lastY = DEFAULT_Y_OFFSET;
 
     public componentDidMount() {
         this.roomStoreToken = RoomViewStore.addListener(this.onRoomViewStoreUpdate);
@@ -199,8 +197,8 @@ export default class CallPreview extends React.Component<IProps, IState> {
 
         this.setState({moving: true});
 
-        this.initX = event.pageX - this.lastX;
-        this.initY = event.pageY - this.lastY;
+        this.initX = event.pageX - this.state.translationX;
+        this.initY = event.pageY - this.state.translationY;
     };
 
     private onMoving = (event: React.MouseEvent | MouseEvent) => {
@@ -215,27 +213,30 @@ export default class CallPreview extends React.Component<IProps, IState> {
         const precalculatedLastX = event.pageX - this.initX;
         const precalculatedLastY = event.pageY - this.initY;
 
+        let translationX;
+        let translationY;
+
         // Avoid overflow on the x axis
         if (precalculatedLastX + width >= window.innerWidth) {
-            this.lastX = window.innerWidth - width;
+            translationX = window.innerWidth - width;
         } else if (precalculatedLastX <= 0) {
-            this.lastX = 0;
+            translationX = 0;
         } else {
-            this.lastX = precalculatedLastX;
+            translationX = precalculatedLastX;
         }
 
         // Avoid overflow on the y axis
         if (precalculatedLastY + height >= window.innerHeight) {
-            this.lastY = window.innerHeight - height;
+            translationY = window.innerHeight - height;
         } else if (precalculatedLastY <= 0) {
-            this.lastY = 0;
+            translationY = 0;
         } else {
-            this.lastY = precalculatedLastY;
+            translationY = precalculatedLastY;
         }
 
         this.setState({
-            translationX: this.lastX,
-            translationY: this.lastY,
+            translationX: translationX,
+            translationY: translationY,
         });
     };