sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-30 01:47:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11060 from FamousPig/fix-raw-input

Browse Source 
Fix MouseHandler not being ignored when Raw Input is enabled
This commit is contained in:
Dean Herbert 2020-12-03 12:15:51 +09:00 committed by GitHub
commit a5bb194cb8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
View File

@ -18,7 +18,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
private readonly BindableBool rawInputToggle = new BindableBool(); private readonly BindableBool rawInputToggle = new BindableBool();
private Bindable<double> sensitivityBindable = new BindableDouble(); private Bindable<double> sensitivityBindable = new BindableDouble();
private Bindable<string> ignoredInputHandler; private Bindable<string> ignoredInputHandlers;
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuConfigManager osuConfig, FrameworkConfigManager config) private void load(OsuConfigManager osuConfig, FrameworkConfigManager config)
@ -75,20 +75,20 @@ namespace osu.Game.Overlays.Settings.Sections.Input
{ {
// this is temporary until we support per-handler settings. // this is temporary until we support per-handler settings.
const string raw_mouse_handler = @"OsuTKRawMouseHandler"; const string raw_mouse_handler = @"OsuTKRawMouseHandler";
const string standard_mouse_handler = @"OsuTKMouseHandler"; const string standard_mouse_handlers = @"OsuTKMouseHandler MouseHandler";
ignoredInputHandler.Value = enabled.NewValue ? standard_mouse_handler : raw_mouse_handler; ignoredInputHandlers.Value = enabled.NewValue ? standard_mouse_handlers : raw_mouse_handler;
}; };
ignoredInputHandler = config.GetBindable<string>(FrameworkSetting.IgnoredInputHandlers); ignoredInputHandlers = config.GetBindable<string>(FrameworkSetting.IgnoredInputHandlers);
ignoredInputHandler.ValueChanged += handler => ignoredInputHandlers.ValueChanged += handler =>
{ {
bool raw = !handler.NewValue.Contains("Raw"); bool raw = !handler.NewValue.Contains("Raw");
rawInputToggle.Value = raw; rawInputToggle.Value = raw;
sensitivityBindable.Disabled = !raw; sensitivityBindable.Disabled = !raw;
}; };
ignoredInputHandler.TriggerChange(); ignoredInputHandlers.TriggerChange();
} }
} }