From 5c4f006550226aafe8fcc87df827eb13ddcfffe5 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Mon, 2 Oct 2023 01:40:53 +0400 Subject: [PATCH] Avoid Windows-specific hack to ruin initial main window geometry on Linux --- Telegram/SourceFiles/core/application.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp index 104d887c2..b5cbef8f4 100644 --- a/Telegram/SourceFiles/core/application.cpp +++ b/Telegram/SourceFiles/core/application.cpp @@ -512,14 +512,16 @@ void Application::startMediaView() { InvokeQueued(this, [=] { _mediaView = std::make_unique(); }); -#else // Q_OS_MAC +#elif defined Q_OS_WIN // Q_OS_MAC || Q_OS_WIN // On Windows we needed such hack for the main window, otherwise // somewhere inside the media viewer creating code its geometry // was broken / lost to some invalid values. const auto current = _lastActivePrimaryWindow->widget()->geometry(); _mediaView = std::make_unique(); _lastActivePrimaryWindow->widget()->Ui::RpWidget::setGeometry(current); -#endif // Q_OS_MAC +#else + _mediaView = std::make_unique(); +#endif // Q_OS_MAC || Q_OS_WIN } void Application::startTray() {