fix: Gamepad 强制前台

Author: MistEO

source/MaaGamepadControlUnit/Manager/GamepadControlUnitMgr.cpp

@@ -141,13 +141,17 @@ bool GamepadControlUnitMgr::init_win32_unit()
     return true;
 }
 
-void GamepadControlUnitMgr::send_activate()
+void GamepadControlUnitMgr::ensure_foreground()
 {
     if (!hwnd_) {
         return;
     }
-    // 发送 WM_ACTIVATE + WA_ACTIVE，让目标窗口认为自己被激活
-    SendMessageW(hwnd_, WM_ACTIVATE, WA_ACTIVE, 0);
+
+    if (hwnd_ == GetForegroundWindow()) {
+        return;
+    }
+
+    SetForegroundWindow(hwnd_);
 }
 
 bool GamepadControlUnitMgr::connected() const
@@ -223,7 +227,7 @@ bool GamepadControlUnitMgr::touch_down(int contact, int x, int y, int pressure)
         return false;
     }
 
-    send_activate();
+    ensure_foreground();
 
     switch (contact) {
     case MaaGamepadTouch_LeftStick:
@@ -291,7 +295,7 @@ bool GamepadControlUnitMgr::key_down(int key)
         return false;
     }
 
-    send_activate();
+    ensure_foreground();
 
     return gamepad_input_->press_button(key);
 }

source/MaaGamepadControlUnit/Manager/GamepadControlUnitMgr.h

@@ -19,7 +19,7 @@ class GamepadControlUnitMgr : public Win32ControlUnitAPI
     GamepadControlUnitMgr(HWND hWnd, MaaGamepadType gamepad_type, MaaWin32ScreencapMethod screencap_method);
     virtual ~GamepadControlUnitMgr() override;
 
-public:  // from ControlUnitAPI
+public: // from ControlUnitAPI
     virtual bool connect() override;
     virtual bool connected() const override;
 
@@ -54,7 +54,7 @@ class GamepadControlUnitMgr : public Win32ControlUnitAPI
 
 private:
     bool init_win32_unit();
-    void send_activate();
+    void ensure_foreground();
 
 private:
     HWND hwnd_ = nullptr;
@@ -64,8 +64,8 @@ class GamepadControlUnitMgr : public Win32ControlUnitAPI
     bool connected_ = false;
 
     std::unique_ptr<ViGEmInput> gamepad_input_;
-    std::unique_ptr<Win32ControlUnitLoader> win32_loader_;  // DLL loader
-    std::shared_ptr<ControlUnitAPI> win32_unit_;            // for screencap
+    std::unique_ptr<Win32ControlUnitLoader> win32_loader_; // DLL loader
+    std::shared_ptr<ControlUnitAPI> win32_unit_;           // for screencap
 };
 
 MAA_CTRL_UNIT_NS_END