mirror of
https://github.com/ppy/osu.git
synced 2024-12-14 14:32:55 +08:00
Move horizontal padding to content level to better align scrollbar
This commit is contained in:
parent
bcce9c5e67
commit
e5204e565d
@ -33,23 +33,29 @@ namespace osu.Game.Overlays.FirstRunSetup
|
||||
new OsuScrollContainer(Direction.Vertical)
|
||||
{
|
||||
RelativeSizeAxes = Axes.Both,
|
||||
ScrollbarOverlapsContent = false,
|
||||
Children = new Drawable[]
|
||||
Masking = false,
|
||||
Child = new Container
|
||||
{
|
||||
new OsuSpriteText
|
||||
RelativeSizeAxes = Axes.X,
|
||||
AutoSizeAxes = Axes.Y,
|
||||
Padding = new MarginPadding { Horizontal = 30 },
|
||||
Children = new Drawable[]
|
||||
{
|
||||
Text = this.GetLocalisableDescription(),
|
||||
Font = OsuFont.Default.With(size: header_size),
|
||||
Colour = OverlayColourProvider.Light1,
|
||||
new OsuSpriteText
|
||||
{
|
||||
Text = this.GetLocalisableDescription(),
|
||||
Font = OsuFont.Default.With(size: header_size),
|
||||
Colour = OverlayColourProvider.Light1,
|
||||
},
|
||||
Content = new FillFlowContainer
|
||||
{
|
||||
Y = header_size + spacing,
|
||||
Spacing = new Vector2(spacing),
|
||||
RelativeSizeAxes = Axes.X,
|
||||
AutoSizeAxes = Axes.Y,
|
||||
Direction = FillDirection.Vertical,
|
||||
}
|
||||
},
|
||||
Content = new FillFlowContainer
|
||||
{
|
||||
Y = header_size + spacing,
|
||||
Spacing = new Vector2(spacing),
|
||||
RelativeSizeAxes = Axes.X,
|
||||
AutoSizeAxes = Axes.Y,
|
||||
Direction = FillDirection.Vertical,
|
||||
}
|
||||
},
|
||||
}
|
||||
};
|
||||
|
@ -118,11 +118,7 @@ namespace osu.Game.Overlays
|
||||
new Container
|
||||
{
|
||||
RelativeSizeAxes = Axes.Both,
|
||||
Padding = new MarginPadding
|
||||
{
|
||||
Vertical = 20,
|
||||
Horizontal = 20,
|
||||
},
|
||||
Padding = new MarginPadding { Vertical = 20 },
|
||||
Child = screenContent = new Container { RelativeSizeAxes = Axes.Both, },
|
||||
},
|
||||
},
|
||||
|
Loading…
Reference in New Issue
Block a user