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

Merge branch 'master' into remove-working-beatmap-finalizer

Browse Source
This commit is contained in:
Dan Balasescu
2021-03-02 19:14:16 +09:00
committed by GitHub
parent 103dd4a6ce 20825b4b78
commit 2aae9b6600
4 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,7 +68,21 @@ namespace osu.Game.Overlays.Settings.Sections.Input
};
windowMode = config.GetBindable<WindowMode>(FrameworkSetting.WindowMode);
windowMode.BindValueChanged(mode => confineMouseModeSetting.Alpha = mode.NewValue == WindowMode.Fullscreen ? 0 : 1, true);
windowMode.BindValueChanged(mode =>
{
var isFullscreen = mode.NewValue == WindowMode.Fullscreen;
if (isFullscreen)
{
confineMouseModeSetting.Current.Disabled = true;
confineMouseModeSetting.TooltipText = "Not applicable in full screen mode";
}
else
{
confineMouseModeSetting.Current.Disabled = false;
confineMouseModeSetting.TooltipText = string.Empty;
}
}, true);
if (RuntimeInfo.OS != RuntimeInfo.Platform.Windows)
{

2
osu.Game/osu.Game.csproj
View File

@ -29,7 +29,7 @@
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.2.0" />
<PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="ppy.osu.Framework" Version="2021.226.0" />
<PackageReference Include="ppy.osu.Framework" Version="2021.302.0" />
<PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
<PackageReference Include="Sentry" Version="3.0.7" />
<PackageReference Include="SharpCompress" Version="0.28.1" />