RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "Use custom method to focus main window on X11" 

This reverts commit f9bba75395.

See #10441.
This commit is contained in:
John Preston 2021-03-01 11:47:27 +04:00
parent 8142acc709
commit 204dd0a869
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Telegram/SourceFiles/window/main_window.cpp
View File

@ -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()) {

2
Telegram/lib_base

@ -1 +1 @@
Subproject commit 03679eb6838a8d55017bb17465a9b035fa2a80d2
Subproject commit 9005da2a22740668fc3f16597ca08dffbc4b008b