h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-23 00:37:18 +08:00
Code Issues Releases Wiki Activity

Adjust text size to match design

Browse Source
This commit is contained in:
Dean Herbert 2018-03-21 16:04:43 +09:00
parent 63f0419d6a
commit 48142602ea
1 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
osu.Game/Screens/Edit/Screens/Compose/BeatDivisorControl.cs
View File

@ -25,6 +25,7 @@ namespace osu.Game.Screens.Edit.Screens.Compose
{
private readonly BindableBeatDivisor beatDivisor = new BindableBeatDivisor();
private int currentDivisorIndex;
public BeatDivisorControl(BindableBeatDivisor beatDivisor)
{
this.beatDivisor.BindTo(beatDivisor);
@ -40,9 +41,9 @@ namespace osu.Game.Screens.Edit.Screens.Compose
{
new Box
{
Name = "Background",
Name = "Gray Background",
RelativeSizeAxes = Axes.Both,
Colour = Color4.Black
Colour = colours.Gray4
},
new GridContainer
{
@ -51,9 +52,22 @@ namespace osu.Game.Screens.Edit.Screens.Compose
{
new Drawable[]
{
new TickSliderBar(beatDivisor, BindableBeatDivisor.VALID_DIVISORS)
new Container
{
RelativeSizeAxes = Axes.Both,
Children = new Drawable[]
{
new Box
{
Name = "Black Background",
RelativeSizeAxes = Axes.Both,
Colour = Color4.Black
},
new TickSliderBar(beatDivisor, BindableBeatDivisor.VALID_DIVISORS)
{
RelativeSizeAxes = Axes.Both,
}
}
}
},
new Drawable[]
@ -91,16 +105,6 @@ namespace osu.Game.Screens.Edit.Screens.Compose
Action = beatDivisor.Next
}
},
new Drawable[]
{
null,
new TextFlowContainer(s => s.TextSize = 10)
{
Text = "beat snap divisor",
RelativeSizeAxes = Axes.X,
TextAnchor = Anchor.TopCentre
},
},
},
ColumnDimensions = new[]
{
@ -113,6 +117,16 @@ namespace osu.Game.Screens.Edit.Screens.Compose
}
}
},
new Drawable[]
{
new TextFlowContainer(s => s.TextSize = 14)
{
Padding = new MarginPadding { Horizontal = 15 },
Text = "beat snap divisor",
RelativeSizeAxes = Axes.X,
TextAnchor = Anchor.TopCentre
},
}
},
RowDimensions = new[]
{