From fb529605a60c06d369b2dcf4c06a0d8e0c63c088 Mon Sep 17 00:00:00 2001
From: Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
Date: Sat, 5 Sep 2020 18:46:49 +0900
Subject: [PATCH] [EXPLORER] Implement HSHELL_ACTIVATESHELLWINDOW (#3125)

Implement HSHELL_ACTIVATESHELLWINDOW shell hook.
---
 base/shell/explorer/taskswnd.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/base/shell/explorer/taskswnd.cpp b/base/shell/explorer/taskswnd.cpp
index 17d11e27ed0..f8f4147c225 100644
--- a/base/shell/explorer/taskswnd.cpp
+++ b/base/shell/explorer/taskswnd.cpp
@@ -1533,6 +1533,10 @@ public:
             break;
 
         case HSHELL_ACTIVATESHELLWINDOW:
+            ::SwitchToThisWindow(m_Tray->GetHWND(), TRUE);
+            ::SetForegroundWindow(m_Tray->GetHWND());
+            break;
+
         case HSHELL_LANGUAGE:
         case HSHELL_SYSMENU:
         case HSHELL_ENDTASK: