sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-05 23:53:51 +09:00
Code Issues Packages Projects 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
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 readonly BindableBeatDivisor beatDivisor = new BindableBeatDivisor();
private int currentDivisorIndex; private int currentDivisorIndex;
public BeatDivisorControl(BindableBeatDivisor beatDivisor) public BeatDivisorControl(BindableBeatDivisor beatDivisor)
{ {
this.beatDivisor.BindTo(beatDivisor); this.beatDivisor.BindTo(beatDivisor);
@ -40,9 +41,9 @@ namespace osu.Game.Screens.Edit.Screens.Compose
{ {
new Box new Box
{ {
Name = "Background", Name = "Gray Background",
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Colour = Color4.Black Colour = colours.Gray4
}, },
new GridContainer new GridContainer
{ {
@ -51,9 +52,22 @@ namespace osu.Game.Screens.Edit.Screens.Compose
{ {
new Drawable[] new Drawable[]
{ {
new TickSliderBar(beatDivisor, BindableBeatDivisor.VALID_DIVISORS) new Container
{ {
RelativeSizeAxes = Axes.Both, 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[] new Drawable[]
@ -91,16 +105,6 @@ namespace osu.Game.Screens.Edit.Screens.Compose
Action = beatDivisor.Next Action = beatDivisor.Next
} }
}, },
new Drawable[]
{
null,
new TextFlowContainer(s => s.TextSize = 10)
{
Text = "beat snap divisor",
RelativeSizeAxes = Axes.X,
TextAnchor = Anchor.TopCentre
},
},
}, },
ColumnDimensions = new[] 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[] RowDimensions = new[]
{ {