From 7c4344f43ab4e1f65abc5dea433016b1fadecc1f Mon Sep 17 00:00:00 2001
From: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com>
Date: Tue, 21 Jun 2022 08:59:47 -0700
Subject: [PATCH] Fix PiP positioning

---
 ts/components/CallingPip.tsx | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/ts/components/CallingPip.tsx b/ts/components/CallingPip.tsx
index bac3c77d2..2588e2205 100644
--- a/ts/components/CallingPip.tsx
+++ b/ts/components/CallingPip.tsx
@@ -105,8 +105,8 @@ export const CallingPip = ({
       if (positionState.mode === PositionMode.BeingDragged) {
         setPositionState(oldState => ({
           ...oldState,
-          mouseX: ev.screenX,
-          mouseY: ev.screenY,
+          mouseX: ev.clientX,
+          mouseY: ev.clientY,
         }));
       }
     },
@@ -252,13 +252,13 @@ export const CallingPip = ({
           return;
         }
         const rect = node.getBoundingClientRect();
-        const dragOffsetX = ev.screenX - rect.left;
-        const dragOffsetY = ev.screenY - rect.top;
+        const dragOffsetX = ev.clientX - rect.left;
+        const dragOffsetY = ev.clientY - rect.top;
 
         setPositionState({
           mode: PositionMode.BeingDragged,
-          mouseX: ev.screenX,
-          mouseY: ev.screenY,
+          mouseX: ev.clientX,
+          mouseY: ev.clientY,
           dragOffsetX,
           dragOffsetY,
         });
@@ -269,7 +269,7 @@ export const CallingPip = ({
           positionState.mode === PositionMode.BeingDragged
             ? '-webkit-grabbing'
             : '-webkit-grab',
-        transform: `translate3d(${translateX}px,${translateY}px, 0)`,
+        transform: `translate3d(${translateX}px,calc(${translateY}px - var(--titlebar-height)), 0)`,
         transition:
           positionState.mode === PositionMode.BeingDragged
             ? 'none'