Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Always use window position in UserInputManager #6440

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Always use window position in UserInputManager #6440

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80508c2
Always use window position
Susko3 Nov 29, 2024
2a650e0
Remove unused using directive
frenzibyte Nov 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 1 addition & 14 deletions osu.Framework/Input/UserInputManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
using System;
using System.Collections.Immutable;
using System.Drawing;
using osu.Framework.Configuration;
using osu.Framework.Extensions.EnumExtensions;
using osu.Framework.Input.Handlers;
using osu.Framework.Input.StateChanges;
Expand Down Expand Up @@ -85,19 +84,7 @@ public override void HandleInputStateChange(InputStateChangeEvent inputStateChan

private bool mouseOutsideAllDisplays(Vector2 mousePosition)
{
Point windowLocation;

switch (Host.Window.WindowMode.Value)
{
case WindowMode.Windowed:
windowLocation = Host.Window.Position;
break;

default:
windowLocation = Host.Window.CurrentDisplayBindable.Value.Bounds.Location;
break;
}

Point windowLocation = Host.Window.Position;
float scale = Host.Window.Scale;
mousePosition /= scale;

Expand Down
Loading