mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-08-30 22:25:12 +00:00
Code Issues Releases Wiki Activity

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

Browse Source 
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
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_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"
@@ -315,16 +314,8 @@ void MainWindow::activate() {
setWindowState(windowState() & ~Qt::WindowMinimized); setWindowState(windowState() & ~Qt::WindowMinimized);
setVisible(true); setVisible(true);
psActivateProcess(); psActivateProcess();
// allow to focus even if X11 native code is disabled raise();
#ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION activateWindow();
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()) {

2
Telegram/lib_base

Submodule Telegram/lib_base updated: 03679eb683...9005da2a22