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

Merge branch 'master' into osu-fontusage

Browse Source
This commit is contained in:
Dean Herbert
2019-02-22 18:09:23 +09:00
committed by GitHub
parent 8853f7ad76 3f9a7b8873
commit 3015d40f8f
286 changed files with 837 additions and 876 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Screens/Multi/Components/BeatmapTitle.cs
View File

@ -25,7 +25,7 @@ namespace osu.Game.Screens.Multi.Components
[BackgroundDependencyLoader]
private void load()
{
CurrentItem.BindValueChanged(v => updateText(), true);
CurrentItem.BindValueChanged(e => updateText(), true);
}
private float textSize = OsuFont.DEFAULT_FONT_SIZE;

4
osu.Game/Screens/Multi/Components/BeatmapTypeInfo.cs
View File

@ -51,11 +51,11 @@ namespace osu.Game.Screens.Multi.Components
}
};
CurrentItem.BindValueChanged(item =>
CurrentItem.BindValueChanged(e =>
{
beatmapAuthor.Clear();
var beatmap = item?.Beatmap;
var beatmap = e.NewValue?.Beatmap;
if (beatmap != null)
{

4
osu.Game/Screens/Multi/Components/DisableableTabControl.cs
View File

@ -1,7 +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.Configuration;
using osu.Framework.Bindables;
using osu.Framework.Graphics.UserInterface;
using osu.Framework.Input.Events;
@ -29,7 +29,7 @@ namespace osu.Game.Screens.Multi.Components
protected override bool OnClick(ClickEvent e)
{
if (!Enabled)
if (!Enabled.Value)
return true;
return base.OnClick(e);
}

4
osu.Game/Screens/Multi/Components/ModeTypeInfo.cs
View File

@ -46,9 +46,9 @@ namespace osu.Game.Screens.Multi.Components
},
};
CurrentItem.BindValueChanged(updateBeatmap, true);
CurrentItem.BindValueChanged(e => updateBeatmap(e.NewValue), true);
Type.BindValueChanged(v => gameTypeContainer.Child = new DrawableGameType(v) { Size = new Vector2(height) }, true);
Type.BindValueChanged(e => gameTypeContainer.Child = new DrawableGameType(e.NewValue) { Size = new Vector2(height) }, true);
}
private void updateBeatmap(PlaylistItem item)

2
osu.Game/Screens/Multi/Components/MultiplayerBackgroundSprite.cs
View File

@ -16,7 +16,7 @@ namespace osu.Game.Screens.Multi.Components
InternalChild = sprite = CreateBackgroundSprite();
CurrentItem.BindValueChanged(i => sprite.Beatmap.Value = i?.Beatmap, true);
CurrentItem.BindValueChanged(e => sprite.Beatmap.Value = e.NewValue?.Beatmap, true);
}
protected virtual UpdateableBeatmapBackgroundSprite CreateBackgroundSprite() => new UpdateableBeatmapBackgroundSprite { RelativeSizeAxes = Axes.Both };

2
osu.Game/Screens/Multi/Components/ParticipantCount.cs
View File

@ -50,7 +50,7 @@ namespace osu.Game.Screens.Multi.Components
};
MaxParticipants.BindValueChanged(_ => updateMax(), true);
ParticipantCount.BindValueChanged(v => count.Text = v.ToString("#,0"), true);
ParticipantCount.BindValueChanged(e => count.Text = e.NewValue.ToString("#,0"), true);
}
private void updateMax()

4
osu.Game/Screens/Multi/Components/RoomStatusInfo.cs
View File

@ -3,7 +3,7 @@
using System;
using osu.Framework.Allocation;
using osu.Framework.Configuration;
using osu.Framework.Bindables;
using osu.Framework.Extensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
@ -53,7 +53,7 @@ namespace osu.Game.Screens.Multi.Components
public EndDatePart()
: base(DateTimeOffset.UtcNow)
{
EndDate.BindValueChanged(d => Date = d);
EndDate.BindValueChanged(e => Date = e.NewValue);
}
protected override string Format()

4
osu.Game/Screens/Multi/Components/StatusColouredContainer.cs
View File

@ -2,7 +2,7 @@
// See the LICENCE file in the repository root for full licence text.
using osu.Framework.Allocation;
using osu.Framework.Configuration;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Graphics;
@ -25,7 +25,7 @@ namespace osu.Game.Screens.Multi.Components
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
status.BindValueChanged(s => this.FadeColour(s.GetAppropriateColour(colours), transitionDuration), true);
status.BindValueChanged(e => this.FadeColour(e.NewValue.GetAppropriateColour(colours), transitionDuration), true);
}
}
}