From d17c431faf92affd103a85b46f0a79fdf633040e Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Tue, 23 Mar 2021 23:22:17 +0100
Subject: [PATCH 1/2] Disable relative mode for TournamentGame

---
 osu.Game.Tournament/TournamentGame.cs | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tournament/TournamentGame.cs b/osu.Game.Tournament/TournamentGame.cs
index fadb821bef..bf43b198c4 100644
--- a/osu.Game.Tournament/TournamentGame.cs
+++ b/osu.Game.Tournament/TournamentGame.cs
@@ -2,18 +2,21 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Drawing;
-using osu.Framework.Extensions.Color4Extensions;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Configuration;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osu.Framework.Graphics.Colour;
-using osu.Game.Graphics.Cursor;
-using osu.Game.Tournament.Models;
+using osu.Framework.Input.Handlers.Mouse;
+using osu.Framework.Platform;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Cursor;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Tournament.Models;
 using osuTK;
 using osuTK.Graphics;
 
@@ -36,7 +39,7 @@ namespace osu.Game.Tournament
         private LoadingSpinner loadingSpinner;
 
         [BackgroundDependencyLoader]
-        private void load(FrameworkConfigManager frameworkConfig)
+        private void load(FrameworkConfigManager frameworkConfig, GameHost host)
         {
             windowSize = frameworkConfig.GetBindable<Size>(FrameworkSetting.WindowedSize);
             windowMode = frameworkConfig.GetBindable<WindowMode>(FrameworkSetting.WindowMode);
@@ -48,6 +51,9 @@ namespace osu.Game.Tournament
                 Margin = new MarginPadding(40),
             });
 
+            var m = (MouseHandler)host.AvailableInputHandlers.Single(t => t is MouseHandler);
+            m.UseRelativeMode.Value = false;
+
             loadingSpinner.Show();
 
             BracketLoadTask.ContinueWith(_ => LoadComponentsAsync(new[]

From 5ad8dc316fa1aeed2f2dc194c2f9520b7f93ba09 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 Mar 2021 14:09:15 +0900
Subject: [PATCH 2/2] Add inline comment and improve linq robustness

---
 osu.Game.Tournament/TournamentGame.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tournament/TournamentGame.cs b/osu.Game.Tournament/TournamentGame.cs
index bf43b198c4..87e23e3404 100644
--- a/osu.Game.Tournament/TournamentGame.cs
+++ b/osu.Game.Tournament/TournamentGame.cs
@@ -51,8 +51,12 @@ namespace osu.Game.Tournament
                 Margin = new MarginPadding(40),
             });
 
-            var m = (MouseHandler)host.AvailableInputHandlers.Single(t => t is MouseHandler);
-            m.UseRelativeMode.Value = false;
+            // in order to have the OS mouse cursor visible, relative mode needs to be disabled.
+            // can potentially be removed when https://github.com/ppy/osu-framework/issues/4309 is resolved.
+            var mouseHandler = host.AvailableInputHandlers.OfType<MouseHandler>().FirstOrDefault();
+
+            if (mouseHandler != null)
+                mouseHandler.UseRelativeMode.Value = false;
 
             loadingSpinner.Show();