From caf7dc9175335f8ea5b564e7df58225a201c72ff Mon Sep 17 00:00:00 2001 From: Sasha Zakablukov <38879804+AlexZakablukov@users.noreply.github.com> Date: Wed, 1 Jun 2022 13:32:27 +0300 Subject: [PATCH] fix(call): change position of fullscreen call and reset fullscreen on call end --- assets/styles/framework/framework.less | 4 ++++ layouts/Layout.less | 8 ++++---- store/webrtc/actions.ts | 1 + 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/assets/styles/framework/framework.less b/assets/styles/framework/framework.less index 5ef9cde796..cfc97485db 100644 --- a/assets/styles/framework/framework.less +++ b/assets/styles/framework/framework.less @@ -13,6 +13,7 @@ @second-layer-zindex: 20; @third-layer-zindex: 30; @fourth-layer-zindex: 40; +@fifth-layer-zindex: 50; @viewport-width: 100vw; @import url('~/assets/styles/thirdparty/scrollbar.less'); @@ -42,3 +43,6 @@ .fourth-layer { z-index: @fourth-layer-zindex; } +.fifth-layer { + z-index: @fifth-layer-zindex; +} diff --git a/layouts/Layout.less b/layouts/Layout.less index 71881330fd..5728ecfef2 100644 --- a/layouts/Layout.less +++ b/layouts/Layout.less @@ -99,10 +99,6 @@ &.fullscreen-media { .media-open { - flex: 0; - } - #chatbar { - height: 0; margin-top: 0; } .scroll-area { @@ -115,6 +111,10 @@ } #mediastream { height: calc(@full - @toolbar-height - @light-spacing); + &:extend(.fifth-layer); + } + .chat-scroll-content { + overflow: hidden; } } } diff --git a/store/webrtc/actions.ts b/store/webrtc/actions.ts index 9e52b59a02..e457bb915f 100644 --- a/store/webrtc/actions.ts +++ b/store/webrtc/actions.ts @@ -572,6 +572,7 @@ const webRTCActions = { commit('setActiveCall', undefined) commit('updateCreatedAt', 0) commit('conversation/setCalling', false, { root: true }) + commit('ui/fullscreen', false, { root: true }) call.off('INCOMING_CALL', onCallIncoming) call.off('OUTGOING_CALL', onCallOutgoing) call.off('CONNECTED', onCallConnected)