sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-03 06:36:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflicts.

Browse Source
This commit is contained in:
Lucas A
2020-03-30 17:39:11 +02:00
parent 3cae0cedee 378dfe2edf
commit ab01111c36
61 changed files with 1032 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,7 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using osu.Framework;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Configuration;
@ -56,24 +57,32 @@ namespace osu.Game.Overlays.Settings.Sections.Input
},
};
rawInputToggle.ValueChanged += enabled =>
if (RuntimeInfo.OS != RuntimeInfo.Platform.Windows)
{
// this is temporary until we support per-handler settings.
const string raw_mouse_handler = @"OsuTKRawMouseHandler";
const string standard_mouse_handler = @"OsuTKMouseHandler";
ignoredInputHandler.Value = enabled.NewValue ? standard_mouse_handler : raw_mouse_handler;
};
ignoredInputHandler = config.GetBindable<string>(FrameworkSetting.IgnoredInputHandlers);
ignoredInputHandler.ValueChanged += handler =>
rawInputToggle.Disabled = true;
sensitivity.Bindable.Disabled = true;
}
else
{
bool raw = !handler.NewValue.Contains("Raw");
rawInputToggle.Value = raw;
sensitivity.Bindable.Disabled = !raw;
};
rawInputToggle.ValueChanged += enabled =>
{
// this is temporary until we support per-handler settings.
const string raw_mouse_handler = @"OsuTKRawMouseHandler";
const string standard_mouse_handler = @"OsuTKMouseHandler";
ignoredInputHandler.TriggerChange();
ignoredInputHandler.Value = enabled.NewValue ? standard_mouse_handler : raw_mouse_handler;
};
ignoredInputHandler = config.GetBindable<string>(FrameworkSetting.IgnoredInputHandlers);
ignoredInputHandler.ValueChanged += handler =>
{
bool raw = !handler.NewValue.Contains("Raw");
rawInputToggle.Value = raw;
sensitivity.Bindable.Disabled = !raw;
};
ignoredInputHandler.TriggerChange();
}
}
private class SensitivitySetting : SettingsSlider<double, SensitivitySlider>