[windows] Implement focus & blur methods

lijy91 · lijy91 · commit 7df34c4c2dfa · 2022-01-13T00:23:32.000+08:00
diff --git a/README-ZH.md b/README-ZH.md
@@ -259,8 +259,8 @@ class MainFlutterWindow: NSWindow {
 
 | Method             | Description                                                                                                | Linux | macOS | Windows |
 | ------------------ | ---------------------------------------------------------------------------------------------------------- | ----- | ----- | ------- |
-| `focus`            | Focuses on the window.                                                                                     | ✔️     | ✔️     | ➖       |
-| `blur`             | Removes focus from the window.                                                                             | ➖     | ✔️     | ➖       |
+| `focus`            | Focuses on the window.                                                                                     | ✔️     | ✔️     | ✔️       |
+| `blur`             | Removes focus from the window.                                                                             | ➖     | ✔️     | ✔️       |
 | `show`             | Shows and gives focus to the window.                                                                       | ✔️     | ✔️     | ✔️       |
 | `hide`             | Hides the window.                                                                                          | ✔️     | ✔️     | ✔️       |
 | `isVisible`        | Returns `bool` - Whether the window is visible to the user.                                                | ✔️     | ✔️     | ✔️       |
diff --git a/README.md b/README.md
@@ -259,8 +259,8 @@ class MainFlutterWindow: NSWindow {
 
 | Method             | Description                                                                                                | Linux | macOS | Windows |
 | ------------------ | ---------------------------------------------------------------------------------------------------------- | ----- | ----- | ------- |
-| `focus`            | Focuses on the window.                                                                                     | ✔️     | ✔️     | ➖       |
-| `blur`             | Removes focus from the window.                                                                             | ➖     | ✔️     | ➖       |
+| `focus`            | Focuses on the window.                                                                                     | ✔️     | ✔️     | ✔️       |
+| `blur`             | Removes focus from the window.                                                                             | ➖     | ✔️     | ✔️       |
 | `show`             | Shows and gives focus to the window.                                                                       | ✔️     | ✔️     | ✔️       |
 | `hide`             | Hides the window.                                                                                          | ✔️     | ✔️     | ✔️       |
 | `isVisible`        | Returns `bool` - Whether the window is visible to the user.                                                | ✔️     | ✔️     | ✔️       |
diff --git a/windows/window_manager.cpp b/windows/window_manager.cpp
@@ -134,11 +134,29 @@ void WindowManager::WaitUntilReadyToShow()
 
 void WindowManager::Focus()
 {
-    SetForegroundWindow(GetMainWindow());
+    HWND hWnd = GetMainWindow();
+    if (IsMinimized())
+    {
+        Restore();
+    }
+
+    ::SetWindowPos(hWnd, HWND_TOP, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE);
+    SetForegroundWindow(hWnd);
 }
 
 void WindowManager::Blur()
 {
+    HWND hWnd = GetMainWindow();
+    HWND next_hwnd = ::GetNextWindow(hWnd, GW_HWNDNEXT);
+    while (next_hwnd)
+    {
+        if (::IsWindowVisible(next_hwnd))
+        {
+            ::SetForegroundWindow(next_hwnd);
+            return;
+        }
+        next_hwnd = ::GetNextWindow(next_hwnd, GW_HWNDNEXT);
+    }
 }
 
 void WindowManager::Show()
diff --git a/windows/window_manager_plugin.cpp b/windows/window_manager_plugin.cpp
@@ -243,6 +243,11 @@ void WindowManagerPlugin::HandleMethodCall(const flutter::MethodCall<flutter::En
         window_manager->Focus();
         result->Success(flutter::EncodableValue(true));
     }
+    else if (method_name.compare("blur") == 0)
+    {
+        window_manager->Blur();
+        result->Success(flutter::EncodableValue(true));
+    }
     else if (method_name.compare("show") == 0)
     {
         window_manager->Show();

Original file line number	Diff line number	Diff line change
`@@ -243,6 +243,11 @@ void WindowManagerPlugin::HandleMethodCall(const flutter::MethodCall<flutter::En`
`243`	`243`	`window_manager->Focus();`
`244`	`244`	`result->Success(flutter::EncodableValue(true));`
`245`	`245`	`}`
	`246`	`+ else if (method_name.compare("blur") == 0)`
	`247`	`+ {`
	`248`	`+ window_manager->Blur();`
	`249`	`+ result->Success(flutter::EncodableValue(true));`
	`250`	`+ }`
`246`	`251`	`else if (method_name.compare("show") == 0)`
`247`	`252`	`{`
`248`	`253`	`window_manager->Show();`