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

fix: Notification with reply obscuring first action on macOS (#37381)

Browse source 
fix: Notification with reply obscuring first action
This commit is contained in:
Shelley Vohr 2023-03-01 09:46:56 +01:00 committed by GitHub
parent 1f390119fe
commit 8fb0f43030
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -58,7 +58,11 @@ void CocoaNotification::Show(const NotificationOptions& options) {
[notification_ setSoundName:base::SysUTF16ToNSString(options.sound)]; [notification_ setSoundName:base::SysUTF16ToNSString(options.sound)];
} }
[notification_ setHasActionButton:false]; if (options.has_reply) {
[notification_ setHasReplyButton:true];
[notification_ setResponsePlaceholder:base::SysUTF16ToNSString(
options.reply_placeholder)];
}
int i = 0; int i = 0;
action_index_ = UINT_MAX; action_index_ = UINT_MAX;
@ -66,7 +70,10 @@ void CocoaNotification::Show(const NotificationOptions& options) {
[[[NSMutableArray alloc] init] autorelease]; [[[NSMutableArray alloc] init] autorelease];
for (const auto& action : options.actions) { for (const auto& action : options.actions) {
if (action.type == u"button") { if (action.type == u"button") {
if (action_index_ == UINT_MAX) { // If the notification has both a reply and actions,
// the reply takes precedence and the actions all
// become additional actions.
if (!options.has_reply && action_index_ == UINT_MAX) {
// First button observed is the displayed action // First button observed is the displayed action
[notification_ setHasActionButton:true]; [notification_ setHasActionButton:true];
[notification_ [notification_
@ -86,16 +93,11 @@ void CocoaNotification::Show(const NotificationOptions& options) {
} }
i++; i++;
} }
if ([additionalActions count] > 0) { if ([additionalActions count] > 0) {
[notification_ setAdditionalActions:additionalActions]; [notification_ setAdditionalActions:additionalActions];
} }
if (options.has_reply) {
[notification_ setResponsePlaceholder:base::SysUTF16ToNSString(
options.reply_placeholder)];
[notification_ setHasReplyButton:true];
}
if (!options.close_button_text.empty()) { if (!options.close_button_text.empty()) {
[notification_ setOtherButtonTitle:base::SysUTF16ToNSString( [notification_ setOtherButtonTitle:base::SysUTF16ToNSString(
options.close_button_text)]; options.close_button_text)];