mirror of
https://github.com/ppy/osu.git
synced 2024-11-11 22:27:25 +08:00
Slim down bottom timeline
This removes the BPM display, which is commonly cited to have no functional purpose by users, and reduces the height of the bottom bar in exchange for more space for the playfield.
This commit is contained in:
parent
50818da166
commit
29b8948609
@ -31,7 +31,7 @@ namespace osu.Game.Screens.Edit
|
||||
|
||||
RelativeSizeAxes = Axes.X;
|
||||
|
||||
Height = 60;
|
||||
Height = 40;
|
||||
|
||||
Masking = true;
|
||||
EdgeEffect = new EdgeEffectParameters
|
||||
|
@ -46,8 +46,8 @@ namespace osu.Game.Screens.Edit.Components
|
||||
{
|
||||
Anchor = Anchor.CentreLeft,
|
||||
Origin = Anchor.CentreLeft,
|
||||
Scale = new Vector2(1.4f),
|
||||
IconScale = new Vector2(1.4f),
|
||||
Scale = new Vector2(1.2f),
|
||||
IconScale = new Vector2(1.2f),
|
||||
Icon = FontAwesome.Regular.PlayCircle,
|
||||
Action = togglePause,
|
||||
},
|
||||
|
@ -17,8 +17,6 @@ namespace osu.Game.Screens.Edit.Components
|
||||
{
|
||||
public partial class TimeInfoContainer : BottomBarContainer
|
||||
{
|
||||
private OsuSpriteText bpm = null!;
|
||||
|
||||
[Resolved]
|
||||
private EditorBeatmap editorBeatmap { get; set; } = null!;
|
||||
|
||||
@ -26,38 +24,16 @@ namespace osu.Game.Screens.Edit.Components
|
||||
private EditorClock editorClock { get; set; } = null!;
|
||||
|
||||
[BackgroundDependencyLoader]
|
||||
private void load(OsuColour colours, OverlayColourProvider colourProvider)
|
||||
private void load(OverlayColourProvider colourProvider)
|
||||
{
|
||||
Background.Colour = colourProvider.Background5;
|
||||
|
||||
Children = new Drawable[]
|
||||
{
|
||||
new TimestampControl(),
|
||||
bpm = new OsuSpriteText
|
||||
{
|
||||
Colour = colours.Orange1,
|
||||
Anchor = Anchor.CentreLeft,
|
||||
Font = OsuFont.Torus.With(size: 18, weight: FontWeight.SemiBold),
|
||||
Position = new Vector2(2, 5),
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
private double? lastBPM;
|
||||
|
||||
protected override void Update()
|
||||
{
|
||||
base.Update();
|
||||
|
||||
double newBPM = editorBeatmap.ControlPointInfo.TimingPointAt(editorClock.CurrentTime).BPM;
|
||||
|
||||
if (lastBPM != newBPM)
|
||||
{
|
||||
lastBPM = newBPM;
|
||||
bpm.Text = @$"{newBPM:0} BPM";
|
||||
}
|
||||
}
|
||||
|
||||
private partial class TimestampControl : OsuClickableContainer
|
||||
{
|
||||
private Container hoverLayer = null!;
|
||||
|
@ -325,7 +325,7 @@ namespace osu.Game.Screens.Edit
|
||||
{
|
||||
Name = "Screen container",
|
||||
RelativeSizeAxes = Axes.Both,
|
||||
Padding = new MarginPadding { Top = 40, Bottom = 60 },
|
||||
Padding = new MarginPadding { Top = 40, Bottom = 40 },
|
||||
Child = screenContainer = new Container<EditorScreen>
|
||||
{
|
||||
RelativeSizeAxes = Axes.Both,
|
||||
|
Loading…
Reference in New Issue
Block a user