if/SymphonyElectron
1
0
Fork 0
mirror of https://github.com/finos/SymphonyElectron.git synced 2025-02-25 18:55:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into SDA-2390

Browse Source
This commit is contained in:
mattias-symphony 2020-10-21 13:35:10 +02:00 committed by GitHub
commit 2d69489b55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spec/appCacheHandler.spec.ts
View File

@ -8,7 +8,7 @@ jest.mock('fs', () => ({
writeFileSync: jest.fn(), writeFileSync: jest.fn(),
existsSync: jest.fn(() => true), existsSync: jest.fn(() => true),
unlinkSync: jest.fn(), unlinkSync: jest.fn(),
readdirSync: jest.fn(() => ['fake1', 'fake2', 'Symphony.config', 'cloudConfig.config']), readdirSync: jest.fn(() => ['Cache', 'GPUCache', 'Symphony.config', 'cloudConfig.config']),
lstatSync: jest.fn(() => { lstatSync: jest.fn(() => {
return { return {
isDirectory: jest.fn(() => true), isDirectory: jest.fn(() => true),

5
src/app/app-cache-handler.ts
View File

@ -14,14 +14,13 @@ const cacheCheckFilePath: string = path.join(userDataPath, 'CacheCheck');
* Cleans old cache * Cleans old cache
*/ */
const cleanOldCache = (): void => { const cleanOldCache = (): void => {
const configFilename = 'Symphony.config'; const fileRemovalList = ['blob_storage', 'Cache', 'Cookies', 'temp', 'Cookies-journal', 'GPUCache'];
const cloudConfigFilename = 'cloudConfig.config';
const files = fs.readdirSync(userDataPath); const files = fs.readdirSync(userDataPath);
files.forEach((file) => { files.forEach((file) => {
const filePath = path.join(userDataPath, file); const filePath = path.join(userDataPath, file);
if (file === configFilename || file === cloudConfigFilename) { if (!fileRemovalList.includes(file)) {
return; return;
} }

7
src/app/window-handler.ts
View File

@ -1029,6 +1029,8 @@ export class WindowHandler {
if (!this.screenSharingIndicatorWindow || !windowExists(this.screenSharingIndicatorWindow)) { if (!this.screenSharingIndicatorWindow || !windowExists(this.screenSharingIndicatorWindow)) {
return; return;
} }
this.screenSharingIndicatorWindow.webContents.setZoomFactor(1);
this.screenSharingIndicatorWindow.webContents.setVisualZoomLevelLimits(1, 1);
this.screenSharingIndicatorWindow.webContents.send('screen-sharing-indicator-data', { id, streamId }); this.screenSharingIndicatorWindow.webContents.send('screen-sharing-indicator-data', { id, streamId });
}); });
const stopScreenSharing = (_event, indicatorId) => { const stopScreenSharing = (_event, indicatorId) => {
@ -1261,6 +1263,11 @@ export class WindowHandler {
if (!focusedWindow || !windowExists(focusedWindow)) { if (!focusedWindow || !windowExists(focusedWindow)) {
return; return;
} }
if (focusedWindow.getTitle() === 'Screen Sharing Indicator - Symphony') {
return;
}
// electron/lib/browser/api/menu-item-roles.js row 159 // electron/lib/browser/api/menu-item-roles.js row 159
const currentZoomLevel = focusedWindow.webContents.getZoomLevel(); const currentZoomLevel = focusedWindow.webContents.getZoomLevel();
focusedWindow.webContents.setZoomLevel(currentZoomLevel + 0.5); focusedWindow.webContents.setZoomLevel(currentZoomLevel + 0.5);