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

Avoid public exposure

Browse Source
This commit is contained in:
Dean Herbert 2019-06-27 12:11:04 +09:00
parent cc9a7839c9
commit 32c3bee71b
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs
View File

@ -437,12 +437,12 @@ namespace osu.Game.Tests.Visual.Online
private void downloadAssert(bool shown)
{
AddAssert($"is download button {(shown ? "shown" : "hidden")}", () => overlay.IsDownloadButtonsShown == shown);
AddAssert($"is download button {(shown ? "shown" : "hidden")}", () => overlay.DownloadButtonsVisible == shown);
}
private class TestBeatmapSetOverlay : BeatmapSetOverlay
{
public bool IsDownloadButtonsShown => Header.DownloadButtonsContainer.Any();
public bool DownloadButtonsVisible => Header.DownloadButtonsVisibile;
}
}
}

20
osu.Game/Overlays/BeatmapSet/Header.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 System.Linq;
using osu.Framework.Allocation;
using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics;
@ -32,11 +33,12 @@ namespace osu.Game.Overlays.BeatmapSet
private readonly UpdateableBeatmapSetCover cover;
private readonly OsuSpriteText title, artist;
private readonly AuthorInfo author;
private readonly FillFlowContainer downloadButtonsContainer;
private readonly BeatmapAvailability beatmapAvailability;
private readonly BeatmapSetOnlineStatusPill onlineStatusPill;
public Details Details;
public readonly FillFlowContainer DownloadButtonsContainer;
public bool DownloadButtonsVisibile => downloadButtonsContainer.Any();
public readonly BeatmapPicker Picker;
@ -161,7 +163,7 @@ namespace osu.Game.Overlays.BeatmapSet
Children = new Drawable[]
{
favouriteButton = new FavouriteButton(),
DownloadButtonsContainer = new FillFlowContainer
downloadButtonsContainer = new FillFlowContainer
{
RelativeSizeAxes = Axes.Both,
Padding = new MarginPadding { Left = buttons_height + buttons_spacing },
@ -229,7 +231,7 @@ namespace osu.Game.Overlays.BeatmapSet
loading.Show();
DownloadButtonsContainer.FadeOut(transition_duration);
downloadButtonsContainer.FadeOut(transition_duration);
favouriteButton.FadeOut(transition_duration);
}
else
@ -244,7 +246,7 @@ namespace osu.Game.Overlays.BeatmapSet
onlineStatusPill.FadeIn(500, Easing.OutQuint);
onlineStatusPill.Status = setInfo.NewValue.OnlineInfo.Status;
DownloadButtonsContainer.FadeIn(transition_duration);
downloadButtonsContainer.FadeIn(transition_duration);
favouriteButton.FadeIn(transition_duration);
updateDownloadButtons();
@ -258,7 +260,7 @@ namespace osu.Game.Overlays.BeatmapSet
if (BeatmapSet.Value.OnlineInfo.Availability?.DownloadDisabled ?? false)
{
DownloadButtonsContainer.Clear();
downloadButtonsContainer.Clear();
return;
}
@ -266,7 +268,7 @@ namespace osu.Game.Overlays.BeatmapSet
{
case DownloadState.LocallyAvailable:
// temporary for UX until new design is implemented.
DownloadButtonsContainer.Child = new Direct.DownloadButton(BeatmapSet.Value)
downloadButtonsContainer.Child = new Direct.DownloadButton(BeatmapSet.Value)
{
Width = 50,
RelativeSizeAxes = Axes.Y
@ -276,13 +278,13 @@ namespace osu.Game.Overlays.BeatmapSet
case DownloadState.Downloading:
case DownloadState.Downloaded:
// temporary to avoid showing two buttons for maps with novideo. will be fixed in new beatmap overlay design.
DownloadButtonsContainer.Child = new DownloadButton(BeatmapSet.Value);
downloadButtonsContainer.Child = new DownloadButton(BeatmapSet.Value);
break;
default:
DownloadButtonsContainer.Child = new DownloadButton(BeatmapSet.Value);
downloadButtonsContainer.Child = new DownloadButton(BeatmapSet.Value);
if (BeatmapSet.Value.OnlineInfo.HasVideo)
DownloadButtonsContainer.Add(new DownloadButton(BeatmapSet.Value, true));
downloadButtonsContainer.Add(new DownloadButton(BeatmapSet.Value, true));
break;
}
}