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.

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

feat(responsive-ui): Keep aspect ratio for filmstrip self view on mobile web #9848

Merged
merged 3 commits into from
Sep 9, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 8 additions & 4 deletions react/features/base/responsive-ui/actions.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// @flow

import { batch } from 'react-redux';
import type { Dispatch } from 'redux';

import { CHAT_SIZE } from '../../chat/constants';
Expand Down Expand Up @@ -45,10 +46,13 @@ export function clientResized(clientWidth: number, clientHeight: number) {
}
}

return dispatch({
type: CLIENT_RESIZED,
clientHeight,
clientWidth: availableWidth
batch(() => {
dispatch({
type: CLIENT_RESIZED,
clientHeight,
clientWidth: availableWidth
});
dispatch(setAspectRatio(clientWidth, clientHeight));
});
};
}
Expand Down
17 changes: 17 additions & 0 deletions react/features/filmstrip/components/web/Thumbnail.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import {
pinParticipant
} from '../../../base/participants';
import { connect } from '../../../base/redux';
import { ASPECT_RATIO_NARROW } from '../../../base/responsive-ui/constants';
import { isTestModeEnabled } from '../../../base/testing';
import {
getLocalAudioTrack,
Expand All @@ -33,6 +34,7 @@ import {
DISPLAY_MODE_TO_STRING,
DISPLAY_VIDEO,
DISPLAY_VIDEO_WITH_NAME,
MOBILE_FILMSTRIP_PORTRAIT_RATIO,
VIDEO_TEST_EVENTS,
SHOW_TOOLBAR_CONTEXT_MENU_AFTER
} from '../../constants';
Expand Down Expand Up @@ -144,6 +146,11 @@ export type Props = {|
*/
_isMobile: boolean,

/**
* Whether we are currently running in a mobile browser in portrait orientation.
*/
_isMobilePortrait: boolean,

/**
* Indicates whether the participant is screen sharing.
*/
Expand Down Expand Up @@ -764,7 +771,9 @@ class Thumbnail extends Component<Props, State> {
const {
_defaultLocalDisplayName,
_disableLocalVideoFlip,
_height,
_isMobile,
_isMobilePortrait,
_isScreenSharing,
_localFlipX,
_disableProfile,
Expand All @@ -778,6 +787,9 @@ class Thumbnail extends Component<Props, State> {
const videoTrackClassName
= !_disableLocalVideoFlip && _videoTrack && !_isScreenSharing && _localFlipX ? 'flipVideoX' : '';

styles.thumbnail.height = _isMobilePortrait
? `${Math.floor(_height * MOBILE_FILMSTRIP_PORTRAIT_RATIO)}px`
: styles.thumbnail.height;

return (
<span
Expand Down Expand Up @@ -1043,6 +1055,7 @@ function _mapStateToProps(state, ownProps): Object {
? getLocalAudioTrack(tracks) : getTrackByMediaTypeAndParticipant(tracks, MEDIA_TYPE.AUDIO, participantID);
const _currentLayout = getCurrentLayout(state);
let size = {};
let _isMobilePortrait = false;
const {
startSilent,
disableLocalVideoFlip,
Expand Down Expand Up @@ -1078,9 +1091,12 @@ function _mapStateToProps(state, ownProps): Object {
_height: height
};

_isMobilePortrait = _isMobile && state['features/base/responsive-ui'].aspectRatio === ASPECT_RATIO_NARROW;

break;
}
case LAYOUTS.TILE_VIEW: {

const { width, height } = state['features/filmstrip'].tileViewDimensions.thumbnailSize;

size = {
Expand All @@ -1104,6 +1120,7 @@ function _mapStateToProps(state, ownProps): Object {
_isCurrentlyOnLargeVideo: state['features/large-video']?.participantId === id,
_isDominantSpeakerDisabled: interfaceConfig.DISABLE_DOMINANT_SPEAKER_INDICATOR,
_isMobile,
_isMobilePortrait,
_isScreenSharing: _videoTrack?.videoType === 'desktop',
_isTestModeEnabled: isTestModeEnabled(state),
_isVideoPlayable: id && isVideoPlayable(state, id),
Expand Down
8 changes: 8 additions & 0 deletions react/features/filmstrip/constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,14 @@ export const HORIZONTAL_FILMSTRIP_MARGIN = 39;
*/
export const SHOW_TOOLBAR_CONTEXT_MENU_AFTER = 600;


/**
* The ratio for filmstrip self view on mobile portrait mode.
*
* @type {number}
*/
export const MOBILE_FILMSTRIP_PORTRAIT_RATIO = 2.5;

/**
* The margin for each side of the tile view. Taken away from the available
* height and width for the tile container to display in.
Expand Down