From 74fc5524ab9356107b5f8c735233082dd52f5865 Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 1 Feb 2019 15:32:05 +0300 Subject: [PATCH] Fix dock and menu hiding on macOS. Regression was introduced in 0681d10c51. --- Telegram/SourceFiles/mediaview.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Telegram/SourceFiles/mediaview.cpp b/Telegram/SourceFiles/mediaview.cpp index 96006f9f7..3e6e43c2e 100644 --- a/Telegram/SourceFiles/mediaview.cpp +++ b/Telegram/SourceFiles/mediaview.cpp @@ -137,11 +137,11 @@ MediaView::MediaView() }); handleAuthSessionChange(); -#ifdef OS_MAC_OLD - setWindowFlags(Qt::FramelessWindowHint); -#else // OS_MAC_OLD +#ifdef Q_OS_LINUX setWindowFlags(Qt::FramelessWindowHint | Qt::MaximizeUsingFullscreenGeometryHint); -#endif // OS_MAC_OLD +#else // Q_OS_LINUX + setWindowFlags(Qt::FramelessWindowHint); +#endif // Q_OS_LINUX moveToScreen(); setAttribute(Qt::WA_NoSystemBackground, true); setAttribute(Qt::WA_TranslucentBackground, true); @@ -1781,7 +1781,11 @@ void MediaView::displayFinished() { updateControls(); if (isHidden()) { psUpdateOverlayed(this); +#ifdef Q_OS_LINUX showFullScreen(); +#else // Q_OS_LINUX + show(); +#endif // Q_OS_LINUX psShowOverAll(this); activateWindow(); QApplication::setActiveWindow(this);