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

Use custom method to focus main window on X11

This commit is contained in:
Ilya Fedin 2021-02-24 20:45:43 +04:00 committed by John Preston
parent 9b88f816d6
commit f9bba75395
1 changed files with 11 additions and 2 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,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "platform/platform_specific.h" #include "platform/platform_specific.h"
#include "platform/platform_window_title.h" #include "platform/platform_window_title.h"
#include "base/platform/base_platform_info.h" #include "base/platform/base_platform_info.h"
#include "base/platform/base_platform_process.h"
#include "ui/platform/ui_platform_utility.h" #include "ui/platform/ui_platform_utility.h"
#include "history/history.h" #include "history/history.h"
#include "window/themes/window_theme.h" #include "window/themes/window_theme.h"
@ -314,8 +315,16 @@ void MainWindow::activate() {
setWindowState(windowState() & ~Qt::WindowMinimized); setWindowState(windowState() & ~Qt::WindowMinimized);
setVisible(true); setVisible(true);
psActivateProcess(); psActivateProcess();
raise(); // allow to focus even if X11 native code is disabled
activateWindow(); #ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
if (Platform::IsX11()) {
base::Platform::ActivateThisProcessWindow(winId());
} else
#endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
{
raise();
activateWindow();
}
controller().updateIsActiveFocus(); controller().updateIsActiveFocus();
if (wasHidden) { if (wasHidden) {
if (const auto session = sessionController()) { if (const auto session = sessionController()) {