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

Rename download buttons to avoid ambiguity

Browse Source
This commit is contained in:
Dean Herbert
2019-07-03 12:02:35 +09:00
parent 466bc7f28a
commit 23acddcb56
9 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -155,7 +155,7 @@ namespace osu.Game.Overlays.Direct
},
},
},
new DownloadButton(SetInfo)
new PanelDownloadButton(SetInfo)
{
Size = new Vector2(50, 30),
Margin = new MarginPadding(horizontal_padding),

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

@ -27,7 +27,7 @@ namespace osu.Game.Overlays.Direct
private const float height = 70;
private FillFlowContainer statusContainer;
protected DownloadButton DownloadButton;
protected PanelDownloadButton DownloadButton;
private PlayButton playButton;
private Box progressBar;
@ -150,7 +150,7 @@ namespace osu.Game.Overlays.Direct
Anchor = Anchor.CentreRight,
Origin = Anchor.CentreRight,
AutoSizeAxes = Axes.Both,
Child = DownloadButton = new DownloadButton(SetInfo)
Child = DownloadButton = new PanelDownloadButton(SetInfo)
{
Size = new Vector2(height - vertical_padding * 3),
Margin = new MarginPadding { Left = vertical_padding * 2, Right = vertical_padding },

10
osu.Game/Overlays/Direct/DownloadButton.cs → osu.Game/Overlays/Direct/PanelDownloadButton.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// 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.Allocation;
@ -10,16 +10,16 @@ using osu.Game.Online;
namespace osu.Game.Overlays.Direct
{
public class DownloadButton : BeatmapDownloadTrackingComposite
public class PanelDownloadButton : BeatmapDownloadTrackingComposite
{
protected bool DownloadEnabled => button.Enabled.Value;
private readonly bool noVideo;
private readonly ShakeContainer shakeContainer;
private readonly OsuDownloadButton button;
private readonly DownloadButton button;
public DownloadButton(BeatmapSetInfo beatmapSet, bool noVideo = false)
public PanelDownloadButton(BeatmapSetInfo beatmapSet, bool noVideo = false)
: base(beatmapSet)
{
this.noVideo = noVideo;
@ -27,7 +27,7 @@ namespace osu.Game.Overlays.Direct
InternalChild = shakeContainer = new ShakeContainer
{
RelativeSizeAxes = Axes.Both,
Child = button = new OsuDownloadButton
Child = button = new DownloadButton
{
RelativeSizeAxes = Axes.Both,
},