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

Merge remote-tracking branch 'upstream/master' into no-more-colourinfo

Browse Source
This commit is contained in:
Dean Herbert 2017-07-25 10:14:48 +09:00
commit 3c7546e2c1
9 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,6 +73,17 @@ namespace osu.Game.Overlays.Music
};
}
public void AddBeatmapSet(BeatmapSetInfo beatmapSet)
{
items.Add(new PlaylistItem(beatmapSet) { OnSelect = itemSelected });
}
public void RemoveBeatmapSet(BeatmapSetInfo beatmapSet)
{
PlaylistItem itemToRemove = items.Children.FirstOrDefault(item => item.BeatmapSetInfo == beatmapSet);
if (itemToRemove != null) items.Remove(itemToRemove);
}
private class ItemSearchContainer : FillFlowContainer<PlaylistItem>, IHasFilterableChildren
{
public string[] FilterTerms => new string[] { };

3
osu.Game/Overlays/Music/PlaylistOverlay.cs
View File

@ -80,6 +80,9 @@ namespace osu.Game.Overlays.Music
list.BeatmapSets = BeatmapSets = beatmaps.GetAllWithChildren<BeatmapSetInfo>(b => !b.DeletePending).ToList();
beatmaps.BeatmapSetAdded += s => list.AddBeatmapSet(s);
beatmaps.BeatmapSetRemoved += s => list.RemoveBeatmapSet(s);
beatmapBacking.BindTo(game.Beatmap);
filter.Search.OnCommit = (sender, newText) =>

2
osu.Game/Overlays/Profile/ProfileHeader.cs
View File

@ -129,7 +129,7 @@ namespace osu.Game.Overlays.Profile
Origin = Anchor.BottomLeft,
Y = -48
},
countryFlag = new DrawableFlag(user.Country?.FlagName ?? "__")
countryFlag = new DrawableFlag(user.Country?.FlagName)
{
Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft,

2
osu.Game/Screens/Multiplayer/ParticipantInfo.cs
View File

@ -27,7 +27,7 @@ namespace osu.Game.Screens.Multiplayer
set
{
host.Text = value.Username;
flagContainer.Children = new[] { new DrawableFlag(value.Country?.FlagName ?? @"__") { RelativeSizeAxes = Axes.Both } };
flagContainer.Children = new[] { new DrawableFlag(value.Country?.FlagName) { RelativeSizeAxes = Axes.Both } };
}
}

9
osu.Game/Screens/Select/BeatmapCarousel.cs
View File

@ -18,10 +18,11 @@ using System.Threading.Tasks;
using osu.Framework.Allocation;
using osu.Framework.Threading;
using osu.Framework.Configuration;
using osu.Game.Graphics.Containers;
namespace osu.Game.Screens.Select
{
internal class BeatmapCarousel : ScrollContainer
internal class BeatmapCarousel : OsuScrollContainer
{
public BeatmapInfo SelectedBeatmap => selectedPanel?.Beatmap;
@ -177,6 +178,9 @@ namespace osu.Game.Screens.Select
public void SelectNextRandom()
{
if (groups.Count == 0)
return;
randomSelectedBeatmaps.Push(new KeyValuePair<BeatmapGroup, BeatmapPanel>(selectedGroup, selectedGroup.SelectedPanel));
var visibleGroups = getVisibleGroups();
@ -310,6 +314,9 @@ namespace osu.Game.Screens.Select
private void removeGroup(BeatmapGroup group)
{
if (group == null)
return;
groups.Remove(group);
panels.Remove(group.Header);
foreach (var p in group.BeatmapPanels)

2
osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
View File

@ -191,7 +191,7 @@ namespace osu.Game.Screens.Select.Leaderboards
Masking = true,
Children = new Drawable[]
{
new DrawableFlag(Score.User?.Country?.FlagName ?? "__")
new DrawableFlag(Score.User?.Country?.FlagName)
{
Width = 30,
RelativeSizeAxes = Axes.Y,

2
osu.Game/Screens/Select/SongSelect.cs
View File

@ -384,7 +384,7 @@ namespace osu.Game.Screens.Select
private void promptDelete()
{
if (Beatmap != null)
if (Beatmap != null && !Beatmap.IsDefault)
dialogOverlay?.Push(new BeatmapDeleteDialog(Beatmap));
}

4
osu.Game/Users/Country.cs
View File

@ -49,9 +49,9 @@ namespace osu.Game.Users
sprite.Texture = textures.Get($@"Flags/{flagName}");
}
public DrawableFlag(string name = @"__")
public DrawableFlag(string name = null)
{
flagName = name;
flagName = name ?? @"__";
Children = new Drawable[]
{

2
osu.Game/Users/UserPanel.cs
View File

@ -102,7 +102,7 @@ namespace osu.Game.Users
Spacing = new Vector2(5f, 0f),
Children = new Drawable[]
{
new DrawableFlag(user.Country?.FlagName ?? @"__")
new DrawableFlag(user.Country?.FlagName)
{
Width = 30f,
RelativeSizeAxes = Axes.Y,