h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-22 00:43:25 +08:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/ppy/master' into kudosu-info

Browse Source
This commit is contained in:
Andrei Zavatski 2019-08-23 13:05:19 +03:00
commit 87379a42c8
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Overlays/Profile/Sections/ShowMoreButton.cs
View File

@ -124,14 +124,12 @@ namespace osu.Game.Overlays.Profile.Sections
private class ChevronIcon : SpriteIcon private class ChevronIcon : SpriteIcon
{ {
private const int bottom_margin = 2;
private const int icon_size = 8; private const int icon_size = 8;
public ChevronIcon() public ChevronIcon()
{ {
Anchor = Anchor.Centre; Anchor = Anchor.Centre;
Origin = Anchor.Centre; Origin = Anchor.Centre;
Margin = new MarginPadding { Bottom = bottom_margin };
Size = new Vector2(icon_size); Size = new Vector2(icon_size);
Icon = FontAwesome.Solid.ChevronDown; Icon = FontAwesome.Solid.ChevronDown;
} }

9
osu.Game/Overlays/Volume/MuteButton.cs
View File

@ -65,16 +65,15 @@ namespace osu.Game.Overlays.Volume
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Size = new Vector2(20),
} }
}); });
Current.ValueChanged += muted => Current.BindValueChanged(muted =>
{ {
icon.Icon = muted.NewValue ? FontAwesome.Solid.VolumeMute : FontAwesome.Solid.VolumeUp; icon.Icon = muted.NewValue ? FontAwesome.Solid.VolumeMute : FontAwesome.Solid.VolumeUp;
}; icon.Size = new Vector2(muted.NewValue ? 18 : 20);
icon.Margin = new MarginPadding { Right = muted.NewValue ? 2 : 0 };
Current.TriggerChange(); }, true);
} }
protected override bool OnHover(HoverEvent e) protected override bool OnHover(HoverEvent e)

6
osu.Game/Screens/Menu/IntroTriangles.cs
View File

@ -138,7 +138,7 @@ namespace osu.Game.Screens.Menu
private RulesetFlow rulesets; private RulesetFlow rulesets;
private Container rulesetsScale; private Container rulesetsScale;
private Drawable logoContainerSecondary; private Container logoContainerSecondary;
private Drawable lazerLogo; private Drawable lazerLogo;
private GlitchingTriangles triangles; private GlitchingTriangles triangles;
@ -158,7 +158,7 @@ namespace osu.Game.Screens.Menu
{ {
this.game = game; this.game = game;
InternalChildren = new[] InternalChildren = new Drawable[]
{ {
triangles = new GlitchingTriangles triangles = new GlitchingTriangles
{ {
@ -277,7 +277,7 @@ namespace osu.Game.Screens.Menu
{ {
lazerLogo.FadeOut().OnComplete(_ => lazerLogo.FadeOut().OnComplete(_ =>
{ {
lazerLogo.Expire(); logoContainerSecondary.Remove(lazerLogo);
lazerLogo.Dispose(); // explicit disposal as we are pushing a new screen and the expire may not get run. lazerLogo.Dispose(); // explicit disposal as we are pushing a new screen and the expire may not get run.
logo.FadeIn(); logo.FadeIn();