h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 01:52:55 +08:00
Code Issues Releases Wiki Activity

Adjust naming inside the LoadingButton

Browse Source
This commit is contained in:
Andrei Zavatski 2019-10-23 13:39:42 +03:00
parent a6d5a2024a
commit b310fd9d44
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
osu.Game/Graphics/UserInterface/LoadingButton.cs
View File

@ -27,13 +27,13 @@ namespace osu.Game.Graphics.UserInterface
if (value) if (value)
{ {
loading.Show(); loading.Show();
content.FadeOut(fade_duration, Easing.OutQuint); text.FadeOut(fade_duration, Easing.OutQuint);
OnLoadingStart(); OnLoadingStart();
} }
else else
{ {
loading.Hide(); loading.Hide();
content.FadeIn(fade_duration, Easing.OutQuint); text.FadeIn(fade_duration, Easing.OutQuint);
OnLoadingFinished(); OnLoadingFinished();
} }
} }
@ -46,17 +46,17 @@ namespace osu.Game.Graphics.UserInterface
} }
private readonly LoadingAnimation loading; private readonly LoadingAnimation loading;
private readonly Drawable content; private readonly Drawable text;
protected LoadingButton() protected LoadingButton()
{ {
Container background; Container content;
Child = background = CreateBackground(); Child = content = CreateContent();
background.AddRange(new[] content.AddRange(new[]
{ {
content = CreateContent(), text = CreateText(),
loading = new LoadingAnimation loading = new LoadingAnimation
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
@ -90,8 +90,8 @@ namespace osu.Game.Graphics.UserInterface
{ {
} }
protected abstract Container CreateBackground(); protected abstract Container CreateContent();
protected abstract Drawable CreateContent(); protected abstract Drawable CreateText();
} }
} }

4
osu.Game/Graphics/UserInterface/ShowMoreButton.cs
View File

@ -40,7 +40,7 @@ namespace osu.Game.Graphics.UserInterface
AutoSizeAxes = Axes.Both; AutoSizeAxes = Axes.Both;
} }
protected override Container CreateBackground() => new CircularContainer protected override Container CreateContent() => new CircularContainer
{ {
Masking = true, Masking = true,
Size = new Vector2(140, 30), Size = new Vector2(140, 30),
@ -50,7 +50,7 @@ namespace osu.Game.Graphics.UserInterface
} }
}; };
protected override Drawable CreateContent() => new FillFlowContainer protected override Drawable CreateText() => new FillFlowContainer
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,

4
osu.Game/Overlays/Comments/VotePill.cs
View File

@ -84,7 +84,7 @@ namespace osu.Game.Overlays.Comments
IsLoading = false; IsLoading = false;
} }
protected override Container CreateBackground() => new Container protected override Container CreateContent() => new Container
{ {
RelativeSizeAxes = Axes.Y, RelativeSizeAxes = Axes.Y,
AutoSizeAxes = Axes.X, AutoSizeAxes = Axes.X,
@ -119,7 +119,7 @@ namespace osu.Game.Overlays.Comments
}, },
}; };
protected override Drawable CreateContent() => votesCounter = new OsuSpriteText protected override Drawable CreateText() => votesCounter = new OsuSpriteText
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,