Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from
Jun 1, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions assets/styles/framework/framework.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down Expand Up @@ -42,3 +43,6 @@
.fourth-layer {
z-index: @fourth-layer-zindex;
}
.fifth-layer {
z-index: @fifth-layer-zindex;
}
8 changes: 4 additions & 4 deletions layouts/Layout.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,6 @@

&.fullscreen-media {
.media-open {
flex: 0;
}
#chatbar {
height: 0;
margin-top: 0;
}
.scroll-area {
Expand All @@ -115,6 +111,10 @@
}
#mediastream {
height: calc(@full - @toolbar-height - @light-spacing);
&:extend(.fifth-layer);
}
.chat-scroll-content {
overflow: hidden;
}
}
}
Expand Down
1 change: 1 addition & 0 deletions store/webrtc/actions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down