From feb6107ce668c8baca8445f2a085de47f5bc9bb1 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Thu, 1 Sep 2022 17:32:31 +0400 Subject: [PATCH] Qt 6.4 supports window activation with tray on Wayland --- Telegram/SourceFiles/platform/linux/main_window_linux.cpp | 5 ----- Telegram/SourceFiles/platform/linux/main_window_linux.h | 2 -- 2 files changed, 7 deletions(-) diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp index 246dcff1c..a5cecbf79 100644 --- a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp @@ -242,11 +242,6 @@ void MainWindow::initHook() { #endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION } -bool MainWindow::isActiveForTrayMenu() { - updateIsActive(); - return Platform::IsWayland() ? isVisible() : isActive(); -} - void MainWindow::workmodeUpdated(Core::Settings::WorkMode mode) { if (!TrayIconSupported()) { return; diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.h b/Telegram/SourceFiles/platform/linux/main_window_linux.h index de6496660..aa563d423 100644 --- a/Telegram/SourceFiles/platform/linux/main_window_linux.h +++ b/Telegram/SourceFiles/platform/linux/main_window_linux.h @@ -22,8 +22,6 @@ class MainWindow : public Window::MainWindow { public: explicit MainWindow(not_null controller); - bool isActiveForTrayMenu() override; - ~MainWindow(); protected: