From e4d88f829c3fbc397f5a9255169ab023b12ff8bc Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 28 May 2024 18:19:47 +0400
Subject: [PATCH] Remove old window activation workaround for X11 systems

There seem to be no need in it anymore
---
 .../media/view/media_view_overlay_widget.cpp  |  3 ---
 Telegram/SourceFiles/window/main_window.cpp   | 23 -------------------
 Telegram/SourceFiles/window/main_window.h     |  2 --
 .../window/notifications_manager.cpp          |  1 -
 .../SourceFiles/window/window_controller.cpp  |  4 ----
 .../SourceFiles/window/window_controller.h    |  1 -
 6 files changed, 34 deletions(-)

diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 6d7e8d73b..ecbb7b06f 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -2216,9 +2216,6 @@ void OverlayWidget::close() {
 		return;
 	}
 	hide();
-	if (const auto window = Core::App().activeWindow()) {
-		window->reActivate();
-	}
 	_helper->clearState();
 }
 
diff --git a/Telegram/SourceFiles/window/main_window.cpp b/Telegram/SourceFiles/window/main_window.cpp
index 1c5de5967..e776b7637 100644
--- a/Telegram/SourceFiles/window/main_window.cpp
+++ b/Telegram/SourceFiles/window/main_window.cpp
@@ -28,7 +28,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_session.h"
 #include "main/main_session_settings.h"
 #include "base/options.h"
-#include "base/call_delayed.h"
 #include "base/crc32hash.h"
 #include "ui/toast/toast.h"
 #include "ui/widgets/shadow.h"
@@ -951,28 +950,6 @@ bool MainWindow::minimizeToTray() {
 	return true;
 }
 
-void MainWindow::reActivateWindow() {
-	// X11 is the only platform with unreliable activate requests
-	if (!Platform::IsX11()) {
-		return;
-	}
-	const auto weak = Ui::MakeWeak(this);
-	const auto reActivate = [=] {
-		if (const auto w = weak.data()) {
-			if (auto f = QApplication::focusWidget()) {
-				f->clearFocus();
-			}
-			w->activate();
-			if (auto f = QApplication::focusWidget()) {
-				f->clearFocus();
-			}
-			w->setInnerFocus();
-		}
-	};
-	crl::on_main(this, reActivate);
-	base::call_delayed(200, this, reActivate);
-}
-
 void MainWindow::showRightColumn(object_ptr<TWidget> widget) {
 	const auto wasWidth = width();
 	const auto wasRightWidth = _rightColumn ? _rightColumn->width() : 0;
diff --git a/Telegram/SourceFiles/window/main_window.h b/Telegram/SourceFiles/window/main_window.h
index 67f38567c..7bbbf8e86 100644
--- a/Telegram/SourceFiles/window/main_window.h
+++ b/Telegram/SourceFiles/window/main_window.h
@@ -98,8 +98,6 @@ public:
 	}
 	void positionUpdated();
 
-	void reActivateWindow();
-
 	void showRightColumn(object_ptr<TWidget> widget);
 	int maximalExtendBy() const;
 	bool canExtendNoMove(int extendBy) const;
diff --git a/Telegram/SourceFiles/window/notifications_manager.cpp b/Telegram/SourceFiles/window/notifications_manager.cpp
index 052abca8f..460858972 100644
--- a/Telegram/SourceFiles/window/notifications_manager.cpp
+++ b/Telegram/SourceFiles/window/notifications_manager.cpp
@@ -1076,7 +1076,6 @@ void Manager::notificationActivated(
 				history->setLocalDraft(std::move(draft));
 			}
 			window->widget()->showFromTray();
-			window->widget()->reActivateWindow();
 			if (Core::App().passcodeLocked()) {
 				window->widget()->setInnerFocus();
 				system()->clearAll();
diff --git a/Telegram/SourceFiles/window/window_controller.cpp b/Telegram/SourceFiles/window/window_controller.cpp
index 19c12c30e..abe2fa3dc 100644
--- a/Telegram/SourceFiles/window/window_controller.cpp
+++ b/Telegram/SourceFiles/window/window_controller.cpp
@@ -444,10 +444,6 @@ void Controller::activate() {
 	_widget.activate();
 }
 
-void Controller::reActivate() {
-	_widget.reActivateWindow();
-}
-
 void Controller::updateIsActiveFocus() {
 	_isActiveTimer.callOnce(sessionController()
 		? sessionController()->session().serverConfig().onlineFocusTimeout
diff --git a/Telegram/SourceFiles/window/window_controller.h b/Telegram/SourceFiles/window/window_controller.h
index cd5979006..eadd32e2f 100644
--- a/Telegram/SourceFiles/window/window_controller.h
+++ b/Telegram/SourceFiles/window/window_controller.h
@@ -119,7 +119,6 @@ public:
 	}
 
 	void activate();
-	void reActivate();
 	void updateIsActiveFocus();
 	void updateIsActiveBlur();
 	void updateIsActive();