From b3667d69a134c23f03874fd5c6af8bdd98d44703 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 18 Jan 2023 14:53:41 +0400
Subject: [PATCH] Each MainWindow has its own Global Menu.

---
 Telegram/SourceFiles/platform/mac/main_window_mac.mm      | 3 ++-
 Telegram/SourceFiles/window/window_session_controller.cpp | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/platform/mac/main_window_mac.mm b/Telegram/SourceFiles/platform/mac/main_window_mac.mm
index d6210917f..ce4d8efce 100644
--- a/Telegram/SourceFiles/platform/mac/main_window_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/main_window_mac.mm
@@ -213,7 +213,8 @@ MainWindow::Private::~Private() {
 
 MainWindow::MainWindow(not_null<Window::Controller*> controller)
 : Window::MainWindow(controller)
-, _private(std::make_unique<Private>(this)) {
+, _private(std::make_unique<Private>(this))
+, psMainMenu(this) {
 	auto forceOpenGL = std::make_unique<QOpenGLWidget>(this);
 	_hideAfterFullScreenTimer.setCallback([this] { hideAndDeactivate(); });
 }
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index a731b2427..b5361b861 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -1688,6 +1688,9 @@ void SessionController::showPeerHistory(
 		const SectionShow &params,
 		MsgId msgId) {
 	content()->showPeerHistory(peerId, params, msgId);
+	if (peerId && params.activation != anim::activation::background) {
+		_window->activate();
+	}
 }
 
 void SessionController::showMessage(
@@ -1705,6 +1708,9 @@ void SessionController::showMessage(
 			} else {
 				controller->content()->showMessage(item, params);
 			}
+			if (params.activation != anim::activation::background) {
+				controller->window().activate();
+			}
 		});
 }