From b11cc85343f84f3a2a5ed1f06eb03bfa17b00cf6 Mon Sep 17 00:00:00 2001
From: vitalyr <vitalyankh@gmail.com>
Date: Fri, 23 Dec 2022 17:36:52 +0800
Subject: [PATCH] fix cursor grab issue

---
 crates/bevy_winit/src/winit_windows.rs | 4 ++--
 examples/window/window_settings.rs     | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/crates/bevy_winit/src/winit_windows.rs b/crates/bevy_winit/src/winit_windows.rs
index 5967d08d9caa4a..255e31d8f6f197 100644
--- a/crates/bevy_winit/src/winit_windows.rs
+++ b/crates/bevy_winit/src/winit_windows.rs
@@ -165,6 +165,8 @@ impl WinitWindows {
             }
         }
 
+        winit_window.set_cursor_visible(window_descriptor.cursor_visible);
+
         // Do not set the grab mode on window creation if it's none, this can fail on mobile
         if window_descriptor.cursor_grab_mode != CursorGrabMode::None {
             match winit_window
@@ -175,8 +177,6 @@ impl WinitWindows {
             }
         }
 
-        winit_window.set_cursor_visible(window_descriptor.cursor_visible);
-
         self.window_id_to_winit.insert(window_id, winit_window.id());
         self.winit_to_window_id.insert(winit_window.id(), window_id);
 
diff --git a/examples/window/window_settings.rs b/examples/window/window_settings.rs
index a8996c6e85901b..83b12afc60f23c 100644
--- a/examples/window/window_settings.rs
+++ b/examples/window/window_settings.rs
@@ -16,6 +16,7 @@ fn main() {
                 height: 300.,
                 present_mode: PresentMode::AutoVsync,
                 always_on_top: true,
+                cursor_grab_mode: CursorGrabMode::Confined,
                 ..default()
             },
             ..default()