Cmd+Q quit prevention in windowed media viewer.

Telegram/SourceFiles/core/application.cpp

@@ -983,10 +983,11 @@ bool Application::preventsQuit(QuitReason reason) {
 		|| uploadPreventsQuit()
 		|| downloadPreventsQuit()) {
 		return true;
-	} else if (const auto window = activeWindow()) {
+	} else if ((!_mediaView
-		if (window->widget()->isActive()) {
+		|| _mediaView->isHidden()
-			return window->widget()->preventsQuit(reason);
+		|| !_mediaView->isFullScreen())
-		}
+		&& Platform::PreventsQuit(reason)) {
+		return true;
 	}
 	return false;
 }

Telegram/SourceFiles/platform/linux/specific_linux.h

@@ -24,6 +24,10 @@ inline void WriteCrashDumpDetails() {
 inline void AutostartRequestStateFromSystem(Fn<void(bool)> callback) {
 }
 
+inline bool PreventsQuit(Core::QuitReason reason) {
+	return false;
+}
+
 inline void ActivateThisProcess() {
 }
 

Telegram/SourceFiles/platform/mac/main_window_mac.h

@@ -30,8 +30,6 @@ public:
 
 	void updateWindowIcon() override;
 
-	bool preventsQuit(Core::QuitReason reason) override;
-
 	class Private;
 
 protected:

Telegram/SourceFiles/platform/mac/main_window_mac.mm

@@ -29,7 +29,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "platform/platform_specific.h"
 #include "platform/platform_notifications_manager.h"
 #include "base/platform/base_platform_info.h"
-#include "base/platform/mac/base_confirm_quit.h"
 #include "boxes/peer_list_controllers.h"
 #include "boxes/about_box.h"
 #include "lang/lang_keys.h"
@@ -261,19 +260,6 @@ void MainWindow::hideAndDeactivate() {
 	hide();
 }
 
-bool MainWindow::preventsQuit(Core::QuitReason reason) {
-	// Thanks Chromium, see
-	// chromium.org/developers/design-documents/confirm-to-quit-experiment
-	return (reason == Core::QuitReason::QtQuitEvent)
-		&& Core::App().settings().macWarnBeforeQuit()
-		&& ([[NSApp currentEvent] type] == NSEventTypeKeyDown)
-		&& !Platform::ConfirmQuit::RunModal(
-			tr::lng_mac_hold_to_quit(
-				tr::now,
-				lt_text,
-				Platform::ConfirmQuit::QuitKeysString()));
-}
-
 void MainWindow::unreadCounterChangedHook() {
 	updateDockCounter();
 }

Telegram/SourceFiles/platform/mac/specific_mac.mm

@@ -18,6 +18,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/window_controller.h"
 #include "mainwindow.h"
 #include "history/history_location_manager.h"
+#include "base/platform/mac/base_confirm_quit.h"
 #include "base/platform/mac/base_utilities_mac.h"
 #include "base/platform/base_platform_info.h"
 
@@ -187,6 +188,19 @@ bool AutostartSkip() {
 void NewVersionLaunched(int oldVersion) {
 }
 
+bool PreventsQuit(Core::QuitReason reason) {
+	// Thanks Chromium, see
+	// chromium.org/developers/design-documents/confirm-to-quit-experiment
+	return (reason == Core::QuitReason::QtQuitEvent)
+		&& Core::App().settings().macWarnBeforeQuit()
+		&& ([[NSApp currentEvent] type] == NSEventTypeKeyDown)
+		&& !ConfirmQuit::RunModal(
+			tr::lng_mac_hold_to_quit(
+				tr::now,
+				lt_text,
+				ConfirmQuit::QuitKeysString()));
+}
+
 void ActivateThisProcess() {
 	const auto window = Core::App().activeWindow();
 	objc_activateProgram(window ? window->widget()->winId() : 0);

Telegram/SourceFiles/platform/platform_specific.h

@@ -7,6 +7,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+namespace Core {
+enum class QuitReason;
+} // namespace Core
+
 namespace Platform {
 
 void start();
@@ -43,6 +47,8 @@ bool SkipTaskbarSupported();
 void WriteCrashDumpDetails();
 void NewVersionLaunched(int oldVersion);
 
+[[nodiscard]] bool PreventsQuit(Core::QuitReason reason);
+
 [[nodiscard]] std::optional<bool> IsDarkMode();
 [[nodiscard]] inline bool IsDarkModeSupported() {
 	return IsDarkMode().has_value();

Telegram/SourceFiles/platform/win/specific_win.h

@@ -27,6 +27,10 @@ inline bool SkipTaskbarSupported() {
 	return true;
 }
 
+inline bool PreventsQuit(Core::QuitReason reason) {
+	return false;
+}
+
 inline void ActivateThisProcess() {
 }
 

Telegram/SourceFiles/window/main_window.h

@@ -134,10 +134,6 @@ public:
 		updateGlobalMenuHook();
 	}
 
-	[[nodiscard]] virtual bool preventsQuit(Core::QuitReason reason) {
-		return false;
-	}
-
 protected:
 	void leaveEventHook(QEvent *e) override;