From 9b88f816d6ab0058df1121ce1289ccfa3ed91a84 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Wed, 24 Feb 2021 20:45:15 +0400 Subject: [PATCH] Use new Platform::IsX11 --- Telegram/SourceFiles/platform/linux/main_window_linux.cpp | 2 +- Telegram/SourceFiles/platform/linux/specific_linux.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp index 8353d703b..9796164ea 100644 --- a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp @@ -139,7 +139,7 @@ bool XCBSkipTaskbar(QWindow *window, bool set) { bool SkipTaskbar(QWindow *window, bool set) { #ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION - if (!IsWayland()) { + if (IsX11()) { return XCBSkipTaskbar(window, set); } #endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp index b150b2d23..386de2e10 100644 --- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp @@ -132,7 +132,7 @@ void PortalAutostart(bool start, bool silent = false) { const auto parentWindowId = [&] { if (const auto activeWindow = Core::App().activeWindow()) { - if (!IsWayland()) { + if (IsX11()) { return qsl("x11:%1").arg(QString::number( activeWindow->widget().get()->windowHandle()->winId(), 16)); @@ -579,7 +579,7 @@ bool TrayIconSupported() { bool SkipTaskbarSupported() { #ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION - return !IsWayland() + return IsX11() && base::Platform::XCB::IsSupportedByWM("_NET_WM_STATE_SKIP_TASKBAR"); #endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION