if/SymphonyElectron
1
0
Fork 0
mirror of https://github.com/finos/SymphonyElectron.git synced 2026-08-18 08:54:47 -05:00
Code Issues Packages Projects Releases Wiki Activity

SDA-1716 - Fix issues with source name case-sensitivity (#860)

Browse Source
This commit is contained in:
Kiran Niranjan
2020-01-27 14:01:04 +05:30
committed by Vishwas Shashidhar
parent 21b7e20e9e
commit 6525825a1b
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/renderer/components/screen-picker.tsx
+9 -7
View File
@@ -6,8 +6,9 @@ import { apiCmds, apiName } from '../../common/api-interface';
import { isLinux, isMac, isWindowsOS } from '../../common/env'; import { isLinux, isMac, isWindowsOS } from '../../common/env';
import { i18n } from '../../common/i18n-preload'; import { i18n } from '../../common/i18n-preload';
const screenRegExp = new RegExp(/^Screen \d+$/gmi); const screenRegExp = new RegExp(/^screen \d+$/gmi);
const SCREEN_PICKER_NAMESPACE = 'ScreenPicker'; const SCREEN_PICKER_NAMESPACE = 'ScreenPicker';
const ENTIRE_SCREEN = 'entire screen';
interface IState { interface IState {
sources: ICustomDesktopCapturerSource[]; sources: ICustomDesktopCapturerSource[];
@@ -131,14 +132,15 @@ export default class ScreenPicker extends React.Component<{}, IState> {
'ScreenPicker-item-container', 'ScreenPicker-item-container',
{ 'ScreenPicker-selected': this.shouldHighlight(source.id) }, { 'ScreenPicker-selected': this.shouldHighlight(source.id) },
); );
if (((isMac || isLinux) && source.display_id !== '') || (isWindowsOS && (source.name === 'Entire screen' || screenRegExp.exec(source.name)))) { const sourceName = source.name.toLocaleLowerCase();
if (((isMac || isLinux) && source.display_id !== '') || (isWindowsOS && (sourceName === ENTIRE_SCREEN || screenRegExp.exec(sourceName)))) {
source.fileName = 'fullscreen'; source.fileName = 'fullscreen';
let sourceName; let screenName;
if (source.name === 'Entire screen') { if (sourceName === ENTIRE_SCREEN) {
sourceName = i18n.t('Entire screen', SCREEN_PICKER_NAMESPACE)(); screenName = i18n.t('Entire screen', SCREEN_PICKER_NAMESPACE)();
} else { } else {
const screenNumber = source.name.substr(7, source.name.length); const screenNumber = source.name.substr(7, source.name.length);
sourceName = i18n.t('Screen {number}', SCREEN_PICKER_NAMESPACE)({ number: screenNumber }); screenName = i18n.t('Screen {number}', SCREEN_PICKER_NAMESPACE)({ number: screenNumber });
} }
screens.push( screens.push(
<div <div
@@ -148,7 +150,7 @@ export default class ScreenPicker extends React.Component<{}, IState> {
<div className='ScreenPicker-screen-section-box'> <div className='ScreenPicker-screen-section-box'>
<img className='ScreenPicker-img-wrapper' src={source.thumbnail as any} alt='thumbnail image'/> <img className='ScreenPicker-img-wrapper' src={source.thumbnail as any} alt='thumbnail image'/>
</div> </div>
<div className='ScreenPicker-screen-source-title'>{sourceName}</div> <div className='ScreenPicker-screen-source-title'>{screenName}</div>
</div>, </div>,
); );
} else { } else {