h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-07 18:33:04 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into osuTK

Browse Source
This commit is contained in:
Dean Herbert 2018-11-21 18:53:11 +09:00 committed by GitHub
commit 7755242a43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game/Beatmaps/Drawables/BeatmapSetDownloader.cs
View File

@ -78,17 +78,17 @@ namespace osu.Game.Beatmaps.Drawables
} }
} }
private void setAdded(BeatmapSetInfo s) private void setAdded(BeatmapSetInfo s) => Schedule(() =>
{ {
if (s.OnlineBeatmapSetID == set.OnlineBeatmapSetID) if (s.OnlineBeatmapSetID == set.OnlineBeatmapSetID)
DownloadState.Value = DownloadStatus.Downloaded; DownloadState.Value = DownloadStatus.Downloaded;
} });
private void setRemoved(BeatmapSetInfo s) private void setRemoved(BeatmapSetInfo s) => Schedule(() =>
{ {
if (s.OnlineBeatmapSetID == set.OnlineBeatmapSetID) if (s.OnlineBeatmapSetID == set.OnlineBeatmapSetID)
DownloadState.Value = DownloadStatus.NotDownloaded; DownloadState.Value = DownloadStatus.NotDownloaded;
} });
private void downloadBegan(DownloadBeatmapSetRequest d) private void downloadBegan(DownloadBeatmapSetRequest d)
{ {

1
osu.Game/Online/Chat/ChannelType.cs
View File

@ -6,6 +6,7 @@ namespace osu.Game.Online.Chat
public enum ChannelType public enum ChannelType
{ {
Public, Public,
Private,
Multiplayer, Multiplayer,
Spectator, Spectator,
Temporary, Temporary,

4
osu.Game/Overlays/Direct/DirectPanel.cs
View File

@ -174,11 +174,11 @@ namespace osu.Game.Overlays.Direct
}; };
} }
private void setAdded(BeatmapSetInfo s) private void setAdded(BeatmapSetInfo s) => Schedule(() =>
{ {
if (s.OnlineBeatmapSetID == SetInfo.OnlineBeatmapSetID) if (s.OnlineBeatmapSetID == SetInfo.OnlineBeatmapSetID)
progressBar.FadeOut(500); progressBar.FadeOut(500);
} });
protected override void LoadComplete() protected override void LoadComplete()
{ {

8
osu.Game/Overlays/Music/PlaylistList.cs
View File

@ -83,20 +83,20 @@ namespace osu.Game.Overlays.Music
beatmapBacking.ValueChanged += _ => updateSelectedSet(); beatmapBacking.ValueChanged += _ => updateSelectedSet();
} }
private void addBeatmapSet(BeatmapSetInfo obj) private void addBeatmapSet(BeatmapSetInfo obj) => Schedule(() =>
{ {
var newItem = new PlaylistItem(obj) { OnSelect = set => Selected?.Invoke(set) }; var newItem = new PlaylistItem(obj) { OnSelect = set => Selected?.Invoke(set) };
items.Add(newItem); items.Add(newItem);
items.SetLayoutPosition(newItem, items.Count - 1); items.SetLayoutPosition(newItem, items.Count - 1);
} });
private void removeBeatmapSet(BeatmapSetInfo obj) private void removeBeatmapSet(BeatmapSetInfo obj) => Schedule(() =>
{ {
var itemToRemove = items.FirstOrDefault(i => i.BeatmapSetInfo.ID == obj.ID); var itemToRemove = items.FirstOrDefault(i => i.BeatmapSetInfo.ID == obj.ID);
if (itemToRemove != null) if (itemToRemove != null)
items.Remove(itemToRemove); items.Remove(itemToRemove);
} });
private void updateSelectedSet() private void updateSelectedSet()
{ {

4
osu.Game/Overlays/MusicController.cs
View File

@ -214,8 +214,8 @@ namespace osu.Game.Overlays
beatmapSets.Insert(index, beatmapSetInfo); beatmapSets.Insert(index, beatmapSetInfo);
} }
private void handleBeatmapAdded(BeatmapSetInfo obj) => beatmapSets.Add(obj); private void handleBeatmapAdded(BeatmapSetInfo obj) => Schedule(() => beatmapSets.Add(obj));
private void handleBeatmapRemoved(BeatmapSetInfo obj) => beatmapSets.RemoveAll(s => s.ID == obj.ID); private void handleBeatmapRemoved(BeatmapSetInfo obj) => Schedule(() => beatmapSets.RemoveAll(s => s.ID == obj.ID));
protected override void LoadComplete() protected override void LoadComplete()
{ {

4
osu.Game/Overlays/Settings/Sections/SkinSection.cs
View File

@ -70,8 +70,8 @@ namespace osu.Game.Overlays.Settings.Sections
dropdownBindable.BindValueChanged(v => configBindable.Value = v.ID); dropdownBindable.BindValueChanged(v => configBindable.Value = v.ID);
} }
private void itemRemoved(SkinInfo s) => skinDropdown.Items = skinDropdown.Items.Where(i => i.ID != s.ID).ToArray(); private void itemRemoved(SkinInfo s) => Schedule(() => skinDropdown.Items = skinDropdown.Items.Where(i => i.ID != s.ID).ToArray());
private void itemAdded(SkinInfo s) => skinDropdown.Items = skinDropdown.Items.Append(s).ToArray(); private void itemAdded(SkinInfo s) => Schedule(() => skinDropdown.Items = skinDropdown.Items.Append(s).ToArray());
protected override void Dispose(bool isDisposing) protected override void Dispose(bool isDisposing)
{ {