mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix: Notification 'Show' button visible when no actions exist (#38997)

Browse source
This commit is contained in:
Shelley Vohr 2023-07-06 21:50:08 +02:00 committed by GitHub
parent cc7d724a3b
commit a97028bacf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
shell/browser/notifications/mac/cocoa_notification.mm
View file

@ -64,6 +64,11 @@ void CocoaNotification::Show(const NotificationOptions& options) {
options.reply_placeholder)];
}
// We need to explicitly set this to false if there are no
// actions, otherwise a Show button will appear by default.
if (options.actions.size() == 0)
[notification_ setHasActionButton:false];
int i = 0;
action_index_ = UINT_MAX;
NSMutableArray* additionalActions =
@ -75,7 +80,6 @@ void CocoaNotification::Show(const NotificationOptions& options) {
// become additional actions.
if (!options.has_reply && action_index_ == UINT_MAX) {
// First button observed is the displayed action
[notification_ setHasActionButton:true];
[notification_
setActionButtonTitle:base::SysUTF16ToNSString(action.text)];
action_index_ = i;