RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-04-01 22:48:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12564 from Joehuu/fix-beatmap-info-download-button-content-scaling

Browse Source 
Fix beatmap info download button content not scaling on mouse down
This commit is contained in:
Dean Herbert 2021-05-01 10:43:59 +09:00 committed by GitHub
commit cbc7753f23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
osu.Game/Overlays/BeatmapSet/Buttons/HeaderDownloadButton.cs
View File

@ -47,28 +47,24 @@ namespace osu.Game.Overlays.BeatmapSet.Buttons
{ {
FillFlowContainer textSprites; FillFlowContainer textSprites;
AddRangeInternal(new Drawable[] AddInternal(shakeContainer = new ShakeContainer
{ {
shakeContainer = new ShakeContainer
{
Depth = -1,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Masking = true, Masking = true,
CornerRadius = 5, CornerRadius = 5,
Children = new Drawable[] Child = button = new HeaderButton { RelativeSizeAxes = Axes.Both },
});
button.AddRange(new Drawable[]
{ {
button = new HeaderButton { RelativeSizeAxes = Axes.Both },
new Container new Container
{ {
// cannot nest inside here due to the structure of button (putting things in its own content).
// requires framework fix.
Padding = new MarginPadding { Horizontal = 10 }, Padding = new MarginPadding { Horizontal = 10 },
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Children = new Drawable[] Children = new Drawable[]
{ {
textSprites = new FillFlowContainer textSprites = new FillFlowContainer
{ {
Depth = -1,
Anchor = Anchor.CentreLeft, Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft, Origin = Anchor.CentreLeft,
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
@ -78,7 +74,6 @@ namespace osu.Game.Overlays.BeatmapSet.Buttons
}, },
new SpriteIcon new SpriteIcon
{ {
Depth = -1,
Anchor = Anchor.CentreRight, Anchor = Anchor.CentreRight,
Origin = Anchor.CentreRight, Origin = Anchor.CentreRight,
Icon = FontAwesome.Solid.Download, Icon = FontAwesome.Solid.Download,
@ -88,12 +83,9 @@ namespace osu.Game.Overlays.BeatmapSet.Buttons
}, },
new DownloadProgressBar(BeatmapSet.Value) new DownloadProgressBar(BeatmapSet.Value)
{ {
Depth = -2,
Anchor = Anchor.BottomLeft, Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft, Origin = Anchor.BottomLeft,
}, },
},
},
}); });
button.Action = () => button.Action = () =>