From 2ce75d45b2b8a6136bd5ac6143dc4875ef917d52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Sat, 7 Aug 2021 09:16:34 +0200 Subject: [PATCH 1/4] Fix tranlation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- src/components/views/voip/CallView/CallViewHeader.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/views/voip/CallView/CallViewHeader.tsx b/src/components/views/voip/CallView/CallViewHeader.tsx index acc577c5d9..dd11bc9acf 100644 --- a/src/components/views/voip/CallView/CallViewHeader.tsx +++ b/src/components/views/voip/CallView/CallViewHeader.tsx @@ -17,7 +17,7 @@ limitations under the License. import { CallType } from 'matrix-js-sdk/src/webrtc/call'; import { Room } from 'matrix-js-sdk/src/models/room'; import React from 'react'; -import { _t } from '../../../../languageHandler'; +import { _t, _td } from '../../../../languageHandler'; import RoomAvatar from '../../avatars/RoomAvatar'; import AccessibleButton from '../../elements/AccessibleButton'; import dis from '../../../../dispatcher/dispatcher'; @@ -25,8 +25,8 @@ import classNames from 'classnames'; import AccessibleTooltipButton from '../../elements/AccessibleTooltipButton'; const callTypeTranslationByType: Record = { - [CallType.Video]: _t("Video Call"), - [CallType.Voice]: _t("Voice Call"), + [CallType.Video]: _td("Video Call"), + [CallType.Voice]: _td("Voice Call"), }; interface CallViewHeaderProps { @@ -100,7 +100,7 @@ export const CallViewHeader: React.FC = ({ onPipMouseDown, }) => { const [callRoom, onHoldCallRoom] = callRooms; - const callTypeText = callTypeTranslationByType[type]; + const callTypeText = _t(callTypeTranslationByType[type]); const callRoomName = callRoom.name; const { roomId } = callRoom; From 63ed852c681891f4dd59e689d7e2938c98c875f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Sat, 7 Aug 2021 09:31:32 +0200 Subject: [PATCH 2/4] Fix typo which caused the wrong PiP position MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- src/components/views/voip/PictureInPictureDragger.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/views/voip/PictureInPictureDragger.tsx b/src/components/views/voip/PictureInPictureDragger.tsx index e8617e09f2..a0d5299166 100644 --- a/src/components/views/voip/PictureInPictureDragger.tsx +++ b/src/components/views/voip/PictureInPictureDragger.tsx @@ -60,7 +60,7 @@ export class PictureInPictureDragger extends React.Component { private initX = 0; private initY = 0; private desiredTranslationX = UIStore.instance.windowWidth - PADDING.right - PIP_VIEW_WIDTH; - private desiredTranslationY = UIStore.instance.windowHeight - PADDING.bottom - PIP_VIEW_WIDTH; + private desiredTranslationY = UIStore.instance.windowHeight - PADDING.bottom - PIP_VIEW_HEIGHT; private moving = false; private scheduledUpdate = new MarkedExecution( () => this.animationCallback(), @@ -72,7 +72,7 @@ export class PictureInPictureDragger extends React.Component { this.state = { translationX: UIStore.instance.windowWidth - PADDING.right - PIP_VIEW_WIDTH, - translationY: UIStore.instance.windowHeight - PADDING.bottom - PIP_VIEW_WIDTH, + translationY: UIStore.instance.windowHeight - PADDING.bottom - PIP_VIEW_HEIGHT, }; } From d8b492f47d2bdb150ef29d0412e566d91c887ce5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Sat, 7 Aug 2021 09:38:26 +0200 Subject: [PATCH 3/4] Correctly hide fullscreen button MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- .../views/voip/CallView/CallViewHeader.tsx | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/components/views/voip/CallView/CallViewHeader.tsx b/src/components/views/voip/CallView/CallViewHeader.tsx index dd11bc9acf..8145c47871 100644 --- a/src/components/views/voip/CallView/CallViewHeader.tsx +++ b/src/components/views/voip/CallView/CallViewHeader.tsx @@ -62,12 +62,13 @@ type CallControlsProps = Pick & { }; const CallViewHeaderControls: React.FC = ({ pipMode = false, type, roomId }) => { return
- { (pipMode && type === CallType.Video) && - } - { pipMode && } + { pipMode && onExpandClick(roomId)} title={_t("Return to call")} /> } From fe1dfa209ac188896121e460a6cedc65d66ed70b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Sat, 7 Aug 2021 10:13:27 +0200 Subject: [PATCH 4/4] rethemendex MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- res/css/_components.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/css/_components.scss b/res/css/_components.scss index b2089f9205..af161c92c6 100644 --- a/res/css/_components.scss +++ b/res/css/_components.scss @@ -274,8 +274,8 @@ @import "./views/voip/_CallPreview.scss"; @import "./views/voip/_CallView.scss"; @import "./views/voip/_CallViewForRoom.scss"; -@import "./views/voip/_CallViewSidebar.scss"; @import "./views/voip/_CallViewHeader.scss"; +@import "./views/voip/_CallViewSidebar.scss"; @import "./views/voip/_DialPad.scss"; @import "./views/voip/_DialPadContextMenu.scss"; @import "./views/voip/_DialPadModal.scss";