h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-13 12:53:11 +08:00
Code Issues Releases Wiki Activity

Further refactoring. I think this may have polluted the FooterButton too much. Not sure what to do about the centering.

Browse Source
This commit is contained in:
Viktor Rosvall 2020-01-01 12:22:19 +01:00
parent 8695e57f62
commit ddec59ec91
2 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
osu.Game/Screens/Select/FooterButton.cs
View File

@ -56,7 +56,8 @@ namespace osu.Game.Screens.Select
}
}
protected FillFlowContainer TextContainer;
protected FillFlowContainer ButtonContentContainer;
protected readonly Container TextContainer;
protected readonly SpriteText SpriteText;
private readonly Box box;
private readonly Box light;
@ -80,24 +81,35 @@ namespace osu.Game.Screens.Select
EdgeSmoothness = new Vector2(2, 0),
RelativeSizeAxes = Axes.X,
},
TextContainer = new FillFlowContainer
new Container
{
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
Direction = FillDirection.Horizontal,
Shear = -SHEAR,
AutoSizeAxes = Axes.Both,
Children = new Drawable[]
{
SpriteText = new OsuSpriteText
ButtonContentContainer = new FillFlowContainer
{
Size = new Vector2(100 - SHEAR_WIDTH, 50),
Shear = SHEAR,
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
}
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
Direction = FillDirection.Horizontal,
Shear = -SHEAR,
AutoSizeAxes = Axes.Both,
Margin = new MarginPadding { Horizontal = SHEAR_WIDTH / 4 },
Children = new Drawable[]
{
TextContainer = new Container
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Size = new Vector2(100 - SHEAR_WIDTH, 50),
Child = SpriteText = new OsuSpriteText
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
}
},
},
},
},
AutoSizeAxes = Axes.Both,
// Margin = new MarginPadding { Left = 70, Right = 14 }
},
};
}

6
osu.Game/Screens/Select/FooterButtonMods.cs
View File

@ -34,19 +34,19 @@ namespace osu.Game.Screens.Select
public FooterButtonMods()
{
TextContainer.Add(modDisplay = new FooterModDisplay
ButtonContentContainer.Add(modDisplay = new FooterModDisplay
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
DisplayUnrankedText = false,
Scale = new Vector2(0.8f)
});
TextContainer.Add(MultiplierText = new OsuSpriteText
ButtonContentContainer.Add(MultiplierText = new OsuSpriteText
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Font = OsuFont.GetFont(weight: FontWeight.Bold),
// Margin = new MarginPadding { Right = 6 }
Margin = new MarginPadding { Right = 10 }
});
}