From 204dd0a8691a13faeec751430c0ee5ba9cd70b7c Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 1 Mar 2021 11:47:27 +0400 Subject: [PATCH] Revert "Use custom method to focus main window on X11" This reverts commit f9bba753952e110ae388126704b7f664be2ce1ad. See #10441. --- Telegram/SourceFiles/window/main_window.cpp | 13 ++----------- Telegram/lib_base | 2 +- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/Telegram/SourceFiles/window/main_window.cpp b/Telegram/SourceFiles/window/main_window.cpp index 0c55dcc44f..154f030e45 100644 --- a/Telegram/SourceFiles/window/main_window.cpp +++ b/Telegram/SourceFiles/window/main_window.cpp @@ -11,7 +11,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "platform/platform_specific.h" #include "platform/platform_window_title.h" #include "base/platform/base_platform_info.h" -#include "base/platform/base_platform_process.h" #include "ui/platform/ui_platform_utility.h" #include "history/history.h" #include "window/themes/window_theme.h" @@ -315,16 +314,8 @@ void MainWindow::activate() { setWindowState(windowState() & ~Qt::WindowMinimized); setVisible(true); psActivateProcess(); - // allow to focus even if X11 native code is disabled -#ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION - if (Platform::IsX11()) { - base::Platform::ActivateThisProcessWindow(winId()); - } else -#endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION - { - raise(); - activateWindow(); - } + raise(); + activateWindow(); controller().updateIsActiveFocus(); if (wasHidden) { if (const auto session = sessionController()) { diff --git a/Telegram/lib_base b/Telegram/lib_base index 03679eb683..9005da2a22 160000 --- a/Telegram/lib_base +++ b/Telegram/lib_base @@ -1 +1 @@ -Subproject commit 03679eb6838a8d55017bb17465a9b035fa2a80d2 +Subproject commit 9005da2a22740668fc3f16597ca08dffbc4b008b