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

Test the download button directly for safety

Browse Source
This commit is contained in:
smoogipoo
2019-06-27 13:35:14 +09:00
parent 3294464bc6
commit c1277b5db2
4 changed files with 102 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game/Overlays/Direct/DirectGridPanel.cs
View File

@ -25,7 +25,6 @@ namespace osu.Game.Overlays.Direct
private const float vertical_padding = 5;
private FillFlowContainer bottomPanel, statusContainer;
protected DownloadButton DownloadButton;
private PlayButton playButton;
private Box progressBar;
@ -156,7 +155,7 @@ namespace osu.Game.Overlays.Direct
},
},
},
DownloadButton = new DownloadButton(SetInfo)
new DownloadButton(SetInfo)
{
Size = new Vector2(50, 30),
Margin = new MarginPadding(horizontal_padding),

13
osu.Game/Overlays/Direct/DownloadButton.cs
View File

@ -2,7 +2,6 @@
// See the LICENCE file in the repository root for full licence text.
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.Sprites;
@ -17,19 +16,17 @@ namespace osu.Game.Overlays.Direct
{
public class DownloadButton : BeatmapDownloadTrackingComposite
{
protected bool DownloadAllowed => button.Enabled.Value;
private readonly bool noVideo;
private readonly SpriteIcon icon;
private readonly SpriteIcon checkmark;
private readonly Box background;
private OsuColour colours;
private readonly ShakeContainer shakeContainer;
private readonly OsuAnimatedButton button;
public readonly BindableBool Enabled = new BindableBool(true);
public DownloadButton(BeatmapSetInfo beatmapSet, bool noVideo = false)
: base(beatmapSet)
{
@ -66,8 +63,6 @@ namespace osu.Game.Overlays.Direct
}
}
};
Enabled.BindTo(button.Enabled);
}
protected override void LoadComplete()
@ -78,14 +73,14 @@ namespace osu.Game.Overlays.Direct
FinishTransforms(true);
}
[BackgroundDependencyLoader(permitNulls: true)]
[BackgroundDependencyLoader(true)]
private void load(OsuColour colours, OsuGame game, BeatmapManager beatmaps)
{
this.colours = colours;
if (BeatmapSet.Value.OnlineInfo.Availability?.DownloadDisabled ?? false)
{
Enabled.Value = false;
button.Enabled.Value = false;
button.TooltipText = "This beatmap is currently not available for download.";
return;
}