fix(call): change position of fullscreen call and reset fullscreen on…

… call end
Satellite-im · Jun 1, 2022 · caf7dc9 · caf7dc9
1 parent ae9c04b
commit caf7dc9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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)