From 81cd0c45b7f18d6f695c16bb1f5ab05b29dc7037 Mon Sep 17 00:00:00 2001
From: Night_Hunter <samuelhuntnz@gmail.com>
Date: Sat, 10 Dec 2022 01:49:29 +1300
Subject: [PATCH 1/2] Add `FocusWindow` to `window::Action`

---
 native/src/window/action.rs | 13 +++++++++++++
 winit/src/application.rs    |  1 +
 2 files changed, 14 insertions(+)

diff --git a/native/src/window/action.rs b/native/src/window/action.rs
index f0fe845d15..41d41ee71b 100644
--- a/native/src/window/action.rs
+++ b/native/src/window/action.rs
@@ -58,6 +58,17 @@ pub enum Action<T> {
     /// - **X11:** Requests for user attention must be manually cleared.
     /// - **Wayland:** Requires `xdg_activation_v1` protocol, `None` has no effect.
     RequestUserAttention(Option<UserAttention>),
+    /// Brings the window to the front and sets input focus. Has no effect if the window is
+    /// already in focus, minimized, or not visible.
+    ///
+    /// This method steals input focus from other applications. Do not use this method unless
+    /// you are certain that's what the user wants. Focus stealing can cause an extremely disruptive
+    /// user experience.
+    ///
+    /// ## Platform-specific
+    ///
+    /// - **Web / Wayland:** Unsupported.
+    FocusWindow,
 }
 
 impl<T> Action<T> {
@@ -83,6 +94,7 @@ impl<T> Action<T> {
             Self::RequestUserAttention(attention_type) => {
                 Action::RequestUserAttention(attention_type)
             }
+            Self::FocusWindow => Action::FocusWindow,
         }
     }
 }
@@ -109,6 +121,7 @@ impl<T> fmt::Debug for Action<T> {
             Self::RequestUserAttention(_) => {
                 write!(f, "Action::RequestUserAttention")
             }
+            Self::FocusWindow => write!(f, "Action::FocusWindow"),
         }
     }
 }
diff --git a/winit/src/application.rs b/winit/src/application.rs
index 7092e124d1..93a9a9ec65 100644
--- a/winit/src/application.rs
+++ b/winit/src/application.rs
@@ -678,6 +678,7 @@ pub fn run_command<A, E>(
                     .request_user_attention(
                         user_attention.map(conversion::user_attention),
                     ),
+                window::Action::FocusWindow => window.focus_window(),
             },
             command::Action::System(action) => match action {
                 system::Action::QueryInformation(_tag) => {

From dd25e93be0d5e5772bf535de38894f285cfb7768 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Mon, 2 Jan 2023 21:14:41 +0100
Subject: [PATCH 2/2] Rename `FocusWindow` to `GainFocus` in `window::Action`

---
 native/src/window/action.rs | 6 +++---
 winit/src/application.rs    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/native/src/window/action.rs b/native/src/window/action.rs
index 41d41ee71b..37fcc2730b 100644
--- a/native/src/window/action.rs
+++ b/native/src/window/action.rs
@@ -68,7 +68,7 @@ pub enum Action<T> {
     /// ## Platform-specific
     ///
     /// - **Web / Wayland:** Unsupported.
-    FocusWindow,
+    GainFocus,
 }
 
 impl<T> Action<T> {
@@ -94,7 +94,7 @@ impl<T> Action<T> {
             Self::RequestUserAttention(attention_type) => {
                 Action::RequestUserAttention(attention_type)
             }
-            Self::FocusWindow => Action::FocusWindow,
+            Self::GainFocus => Action::GainFocus,
         }
     }
 }
@@ -121,7 +121,7 @@ impl<T> fmt::Debug for Action<T> {
             Self::RequestUserAttention(_) => {
                 write!(f, "Action::RequestUserAttention")
             }
-            Self::FocusWindow => write!(f, "Action::FocusWindow"),
+            Self::GainFocus => write!(f, "Action::GainFocus"),
         }
     }
 }
diff --git a/winit/src/application.rs b/winit/src/application.rs
index 93a9a9ec65..1973fdcefb 100644
--- a/winit/src/application.rs
+++ b/winit/src/application.rs
@@ -678,7 +678,7 @@ pub fn run_command<A, E>(
                     .request_user_attention(
                         user_attention.map(conversion::user_attention),
                     ),
-                window::Action::FocusWindow => window.focus_window(),
+                window::Action::GainFocus => window.focus_window(),
             },
             command::Action::System(action) => match action {
                 system::Action::QueryInformation(_tag) => {