Moved showLogoutConfirmation from MainWindow to Window::Controller.

Telegram/SourceFiles/mainwindow.cpp

@@ -670,39 +670,6 @@ void MainWindow::updateTrayMenu(bool force) {
 	psTrayMenuUpdated();
 }
 
-void MainWindow::showLogoutConfirmation() {
-	if (isHidden()) {
-		showFromTray();
-	}
-
-	const auto account = Core::App().passcodeLocked()
-		? nullptr
-		: sessionController()
-		? &sessionController()->session().account()
-		: nullptr;
-	const auto weak = base::make_weak(account);
-	const auto callback = [=] {
-		if (account && !weak) {
-			return;
-		}
-		if (account
-			&& account->sessionExists()
-			&& Core::App().exportManager().inProgress(&account->session())) {
-			Ui::hideLayer();
-			Core::App().exportManager().stopWithConfirmation([=] {
-				Core::App().logout(account);
-			});
-		} else {
-			Core::App().logout(account);
-		}
-	};
-	Ui::show(Box<ConfirmBox>(
-		tr::lng_sure_logout(tr::now),
-		tr::lng_settings_logout(tr::now),
-		st::attentionBoxButton,
-		callback));
-}
-
 bool MainWindow::takeThirdSectionFromLayer() {
 	return _layer ? _layer->takeToThirdSection() : false;
 }

Telegram/SourceFiles/mainwindow.h

@@ -103,8 +103,6 @@ public:
 		not_null<PhotoData*> photo);
 	void hideMediaPreview();
 
-	void showLogoutConfirmation();
-
 	void updateControlsGeometry() override;
 
 protected:

Telegram/SourceFiles/platform/linux/main_window_linux.cpp

@@ -942,10 +942,13 @@ void MainWindow::createGlobalMenu() {
 
 	auto file = psMainMenu->addMenu(tr::lng_mac_menu_file(tr::now));
 
-	psLogout = file->addAction(tr::lng_mac_menu_logout(tr::now));
-	connect(psLogout, &QAction::triggered, psLogout, [] {
-		if (App::wnd()) App::wnd()->showLogoutConfirmation();
-	});
+	psLogout = file->addAction(
+		tr::lng_mac_menu_logout(tr::now),
+		this,
+		[=] {
+			ensureWindowShown();
+			controller().showLogoutConfirmation();
+		});
 
 	auto quit = file->addAction(
 		tr::lng_mac_menu_quit_telegram(tr::now, lt_telegram, qsl("Telegram")),

Telegram/SourceFiles/platform/mac/main_window_mac.mm

@@ -713,10 +713,16 @@ void MainWindow::createGlobalMenu() {
 	}
 
 	QMenu *file = psMainMenu.addMenu(tr::lng_mac_menu_file(tr::now));
-	psLogout = file->addAction(tr::lng_mac_menu_logout(tr::now));
-	connect(psLogout, &QAction::triggered, psLogout, [] {
-		if (App::wnd()) App::wnd()->showLogoutConfirmation();
-	});
+	{
+		auto callback = [=] {
+			ensureWindowShown();
+			controller().showLogoutConfirmation();
+		};
+		psLogout = file->addAction(
+			tr::lng_mac_menu_logout(tr::now),
+			this,
+			std::move(callback));
+	}
 
 	QMenu *edit = psMainMenu.addMenu(tr::lng_mac_menu_edit(tr::now));
 	psUndo = edit->addAction(tr::lng_mac_menu_undo(tr::now), this, SLOT(psMacUndo()), QKeySequence::Undo);

Telegram/SourceFiles/settings/settings_common.cpp

@@ -210,7 +210,7 @@ void FillMenu(
 		}
 		addAction(
 			tr::lng_settings_logout(tr::now),
-			[=] { window->widget()->showLogoutConfirmation(); });
+			[=] { window->showLogoutConfirmation(); });
 	}
 }
 

Telegram/SourceFiles/window/window_controller.cpp

@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "api/api_updates.h"
 #include "core/application.h"
 #include "core/click_handler_types.h"
+#include "export/export_manager.h"
 #include "platform/platform_window_title.h"
 #include "main/main_account.h"
 #include "main/main_domain.h"
@@ -329,4 +330,33 @@ QPoint Controller::getPointForCallPanelCenter() const {
 		: _widget.windowHandle()->screen()->geometry().center();
 }
 
+void Controller::showLogoutConfirmation() {
+	const auto account = Core::App().passcodeLocked()
+		? nullptr
+		: sessionController()
+		? &sessionController()->session().account()
+		: nullptr;
+	const auto weak = base::make_weak(account);
+	const auto callback = [=] {
+		if (account && !weak) {
+			return;
+		}
+		if (account
+			&& account->sessionExists()
+			&& Core::App().exportManager().inProgress(&account->session())) {
+			Ui::hideLayer();
+			Core::App().exportManager().stopWithConfirmation([=] {
+				Core::App().logout(account);
+			});
+		} else {
+			Core::App().logout(account);
+		}
+	};
+	show(Box<ConfirmBox>(
+		tr::lng_sure_logout(tr::now),
+		tr::lng_settings_logout(tr::now),
+		st::attentionBoxButton,
+		callback));
+}
+
 } // namespace Window

Telegram/SourceFiles/window/window_controller.h

@@ -46,6 +46,8 @@ public:
 	void setupIntro();
 	void setupMain();
 
+	void showLogoutConfirmation();
+
 	void showSettings();
 
 	[[nodiscard]] int verticalShadowTop() const;

Telegram/SourceFiles/window/window_lock_widgets.cpp

@@ -120,7 +120,7 @@ PasscodeLockWidget::PasscodeLockWidget(
 
 	_submit->setClickedCallback([=] { submit(); });
 	_logout->setClickedCallback([=] {
-		window->widget()->showLogoutConfirmation();
+		window->showLogoutConfirmation();
 	});
 }