From 5672883270037ea505406bf972bdbbfe9659bef6 Mon Sep 17 00:00:00 2001 From: Luka Kvavilashvili Date: Wed, 1 Feb 2017 13:19:15 +0400 Subject: [PATCH 1/2] Fixed reply in notification deminiaturizing window Using reply feature on the notification was deminiaturizing the main window, even if the user was on other application, or even on different full screen window. --- TelegramTest/AppDelegate.m | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/TelegramTest/AppDelegate.m b/TelegramTest/AppDelegate.m index a158a2be..182e7971 100644 --- a/TelegramTest/AppDelegate.m +++ b/TelegramTest/AppDelegate.m @@ -245,13 +245,15 @@ - (void)userNotificationCenter:(NSUserNotificationCenter *)center didActivateNot ELog(@"nil dialog here, check it"); return; } - - [self.mainWindow deminiaturize:self]; + [self.mainWindow.navigationController showMessagesViewController:dialog]; - - if (floor(NSAppKitVersionNumber) > 1187 && notification.activationType == 3) { //NSUserNotificationActivationTypeReplied) + if (notification.activationType != NSUserNotificationActivationTypeReplied) { + // only deminiaturize the window if user clicked the notification itself + // and not replied + [self.mainWindow deminiaturize:self]; + } else if (floor(NSAppKitVersionNumber) > 1187 && notification.activationType == 3) { //NSUserNotificationActivationTypeReplied) NSString *userResponse = notification.response.string; dispatch_async(dispatch_get_main_queue(), ^{ @@ -273,9 +275,6 @@ - (void)userNotificationCenter:(NSUserNotificationCenter *)center didActivateNot return; } - - - } -(void)didStatusItemClicked { From 658940538adfa409b5a37786d8c44e3a88dfa85e Mon Sep 17 00:00:00 2001 From: Luka Kvavilashvili Date: Wed, 1 Feb 2017 15:11:36 +0400 Subject: [PATCH 2/2] Removed NSUserNotificationActivationTypeReplied @overtake Thanks --- TelegramTest/AppDelegate.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TelegramTest/AppDelegate.m b/TelegramTest/AppDelegate.m index 182e7971..ab2ede48 100644 --- a/TelegramTest/AppDelegate.m +++ b/TelegramTest/AppDelegate.m @@ -249,7 +249,7 @@ - (void)userNotificationCenter:(NSUserNotificationCenter *)center didActivateNot [self.mainWindow.navigationController showMessagesViewController:dialog]; - if (notification.activationType != NSUserNotificationActivationTypeReplied) { + if (notification.activationType != 3) { // only deminiaturize the window if user clicked the notification itself // and not replied [self.mainWindow deminiaturize:self];