improved window activation in os x

palonair · Aug 12, 2015 · afac237 · afac237
1 parent 1b16064
commit afac237
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/Telegram/SourceFiles/pspecific_mac.cpp b/Telegram/SourceFiles/pspecific_mac.cpp
@@ -564,7 +564,9 @@ void psClearInitLogs() {
 }
 
 void psActivateProcess(uint64 pid) {
-	objc_activateProgram();
+	if (!pid) {
+		objc_activateProgram(App::wnd() ? App::wnd()->winId() : 0);
+	}
 }
 
 QString psCurrentCountry() {

diff --git a/Telegram/SourceFiles/pspecific_mac_p.h b/Telegram/SourceFiles/pspecific_mac_p.h
@@ -73,7 +73,7 @@ void objc_execTelegram();
 
 void objc_registerCustomScheme();
 
-void objc_activateProgram();
+void objc_activateProgram(WId winId);
 bool objc_moveFile(const QString &from, const QString &to);
 void objc_deleteDir(const QString &dir);
 

diff --git a/Telegram/SourceFiles/pspecific_mac_p.mm b/Telegram/SourceFiles/pspecific_mac_p.mm
@@ -982,8 +982,12 @@ void objc_execTelegram() {
 	_execUpdater(NO);
 }
 
-void objc_activateProgram() {
+void objc_activateProgram(WId winId) {
 	[NSApp activateIgnoringOtherApps:YES];
+	if (winId) {
+		NSWindow *w = [reinterpret_cast<NSView*>(winId) window];
+		[w makeKeyAndOrderFront:NSApp];
+	}
 }
 
 bool objc_moveFile(const QString &from, const QString &to) {