Fix padding mismatches

This commit is contained in:
Dean Herbert 2022-04-20 16:28:52 +09:00
parent 5c7ff363ce
commit e17f224793
2 changed files with 7 additions and 5 deletions

View File

@ -75,9 +75,9 @@ namespace osu.Game.Overlays.Mods
}, },
new Container new Container
{ {
Margin = new MarginPadding Padding = new MarginPadding
{ {
Vertical = DifficultyMultiplierDisplay.HEIGHT + 10, Top = DifficultyMultiplierDisplay.HEIGHT + PADDING,
}, },
Depth = float.MaxValue, Depth = float.MaxValue,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
@ -116,7 +116,7 @@ namespace osu.Game.Overlays.Mods
{ {
Anchor = Anchor.BottomLeft, Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft, Origin = Anchor.BottomLeft,
Margin = new MarginPadding { Vertical = 14, Left = 70 }, Margin = new MarginPadding { Vertical = PADDING, Left = 70 },
Text = "Mod Customisation", Text = "Mod Customisation",
Active = { BindTarget = customisationVisible } Active = { BindTarget = customisationVisible }
}); });

View File

@ -16,6 +16,8 @@ namespace osu.Game.Overlays.Mods
/// </summary> /// </summary>
public abstract class ShearedOverlayContainer : OsuFocusedOverlayContainer public abstract class ShearedOverlayContainer : OsuFocusedOverlayContainer
{ {
protected const float PADDING = 14;
[Cached] [Cached]
protected readonly OverlayColourProvider ColourProvider; protected readonly OverlayColourProvider ColourProvider;
@ -81,7 +83,7 @@ namespace osu.Game.Overlays.Mods
Padding = new MarginPadding Padding = new MarginPadding
{ {
Top = ShearedOverlayHeader.HEIGHT, Top = ShearedOverlayHeader.HEIGHT,
Bottom = footer_height, Bottom = footer_height + PADDING,
} }
}, },
Footer = new Container Footer = new Container
@ -89,7 +91,7 @@ namespace osu.Game.Overlays.Mods
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Depth = float.MinValue, Depth = float.MinValue,
Height = footer_height, Height = footer_height,
Margin = new MarginPadding { Top = 10 }, Margin = new MarginPadding { Top = PADDING },
Anchor = Anchor.BottomCentre, Anchor = Anchor.BottomCentre,
Origin = Anchor.BottomCentre, Origin = Anchor.BottomCentre,
Children = new Drawable[] Children = new Drawable[]