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

SDA-4332 - Limit toast notification to prevent overlying of call notification (#1966)

Browse Source
This commit is contained in:
Kiran Niranjan 2023-10-04 13:17:18 +05:30 committed by GitHub
parent 61752932b2
commit 641876598a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/app/auto-update-handler.ts
View File

@ -257,9 +257,10 @@ export class AutoUpdate {
const cc = config.getFilteredCloudConfigFields([ const cc = config.getFilteredCloudConfigFields([
'betaAutoUpdateChannelEnabled', 'betaAutoUpdateChannelEnabled',
]); ]);
this.channelConfigLocation = cc this.channelConfigLocation =
? ChannelConfigLocation.ACP 'betaAutoUpdateChannelEnabled' in cc && cc.betaAutoUpdateChannelEnabled
: ChannelConfigLocation.LOCALFILE; ? ChannelConfigLocation.ACP
: ChannelConfigLocation.LOCALFILE;
this.finalAutoUpdateChannel = autoUpdateChannel; this.finalAutoUpdateChannel = autoUpdateChannel;
this.installVariant = installVariant; this.installVariant = installVariant;

7
src/renderer/notification-handler.ts
View File

@ -31,6 +31,7 @@ const NEXT_INSERT_POSITION_WITH_INPUT = 142;
const NOTIFICATIONS_PADDING_SEPARATION = 12; const NOTIFICATIONS_PADDING_SEPARATION = 12;
const CALL_NOTIFICATION_WIDTH = 264; const CALL_NOTIFICATION_WIDTH = 264;
const CALL_NOTIFICATION_HEIGHT = 286; const CALL_NOTIFICATION_HEIGHT = 286;
const MAX_VISIBLE_TOAST_FOR_CALL_NOTIFICATION = 3;
export default class NotificationHandler { export default class NotificationHandler {
public settings: ISettings; public settings: ISettings;
public callNotificationSettings: ICorner = { x: 0, y: 0 }; public callNotificationSettings: ICorner = { x: 0, y: 0 };
@ -150,9 +151,9 @@ export default class NotificationHandler {
} }
this.calculateDimensions(); this.calculateDimensions();
// Maximum amount of Notifications we can show: // Maximum amount of Notifications we can show:
this.settings.maxVisibleNotifications = Math.floor( this.settings.maxVisibleNotifications =
display.workAreaSize.height / this.settings.totalHeight, Math.floor(display.workAreaSize.height / this.settings.totalHeight) -
); MAX_VISIBLE_TOAST_FOR_CALL_NOTIFICATION;
} }
/** /**