mirror of
https://github.com/ppy/osu
synced 2024-12-25 16:22:23 +00:00
Normalise overlay horizontal padding const
This commit is contained in:
parent
daf9f19b29
commit
7a0edabd5d
@ -97,8 +97,8 @@ namespace osu.Game.Overlays.BeatmapSet
|
||||
Padding = new MarginPadding
|
||||
{
|
||||
Vertical = BeatmapSetOverlay.Y_PADDING,
|
||||
Left = BeatmapSetOverlay.X_PADDING,
|
||||
Right = BeatmapSetOverlay.X_PADDING + BeatmapSetOverlay.RIGHT_WIDTH,
|
||||
Left = WaveOverlayContainer.HORIZONTAL_PADDING,
|
||||
Right = WaveOverlayContainer.HORIZONTAL_PADDING + BeatmapSetOverlay.RIGHT_WIDTH,
|
||||
},
|
||||
Children = new Drawable[]
|
||||
{
|
||||
@ -170,7 +170,7 @@ namespace osu.Game.Overlays.BeatmapSet
|
||||
Anchor = Anchor.BottomRight,
|
||||
Origin = Anchor.BottomRight,
|
||||
AutoSizeAxes = Axes.Both,
|
||||
Margin = new MarginPadding { Top = BeatmapSetOverlay.Y_PADDING, Right = BeatmapSetOverlay.X_PADDING },
|
||||
Margin = new MarginPadding { Top = BeatmapSetOverlay.Y_PADDING, Right = WaveOverlayContainer.HORIZONTAL_PADDING },
|
||||
Direction = FillDirection.Vertical,
|
||||
Spacing = new Vector2(10),
|
||||
Children = new Drawable[]
|
||||
|
@ -55,7 +55,7 @@ namespace osu.Game.Overlays.BeatmapSet
|
||||
new Container
|
||||
{
|
||||
RelativeSizeAxes = Axes.Both,
|
||||
Padding = new MarginPadding { Top = 15, Horizontal = BeatmapSetOverlay.X_PADDING },
|
||||
Padding = new MarginPadding { Top = 15, Horizontal = WaveOverlayContainer.HORIZONTAL_PADDING },
|
||||
Children = new Drawable[]
|
||||
{
|
||||
new Container
|
||||
|
@ -25,7 +25,6 @@ namespace osu.Game.Overlays
|
||||
{
|
||||
public partial class BeatmapSetOverlay : OnlineOverlay<BeatmapSetHeader>
|
||||
{
|
||||
public const float X_PADDING = 40;
|
||||
public const float Y_PADDING = 25;
|
||||
public const float RIGHT_WIDTH = 275;
|
||||
|
||||
|
@ -18,8 +18,6 @@ namespace osu.Game.Overlays.Changelog
|
||||
{
|
||||
public partial class ChangelogBuild : FillFlowContainer
|
||||
{
|
||||
public const float HORIZONTAL_PADDING = 70;
|
||||
|
||||
public Action<APIChangelogBuild> SelectBuild;
|
||||
|
||||
protected readonly APIChangelogBuild Build;
|
||||
@ -33,7 +31,7 @@ namespace osu.Game.Overlays.Changelog
|
||||
RelativeSizeAxes = Axes.X;
|
||||
AutoSizeAxes = Axes.Y;
|
||||
Direction = FillDirection.Vertical;
|
||||
Padding = new MarginPadding { Horizontal = HORIZONTAL_PADDING };
|
||||
Padding = new MarginPadding { Horizontal = WaveOverlayContainer.HORIZONTAL_PADDING };
|
||||
|
||||
Children = new Drawable[]
|
||||
{
|
||||
|
@ -64,7 +64,7 @@ namespace osu.Game.Overlays.Changelog
|
||||
{
|
||||
RelativeSizeAxes = Axes.X,
|
||||
Height = 1,
|
||||
Padding = new MarginPadding { Horizontal = ChangelogBuild.HORIZONTAL_PADDING },
|
||||
Padding = new MarginPadding { Horizontal = WaveOverlayContainer.HORIZONTAL_PADDING },
|
||||
Margin = new MarginPadding { Top = 30 },
|
||||
Child = new Box
|
||||
{
|
||||
|
@ -50,7 +50,7 @@ namespace osu.Game.Overlays.Profile.Header
|
||||
RelativeSizeAxes = Axes.X,
|
||||
AutoSizeAxes = Axes.Y,
|
||||
Spacing = new Vector2(10, 10),
|
||||
Padding = new MarginPadding { Horizontal = UserProfileOverlay.CONTENT_X_MARGIN, Top = 10 },
|
||||
Padding = new MarginPadding { Horizontal = WaveOverlayContainer.HORIZONTAL_PADDING, Top = 10 },
|
||||
}
|
||||
};
|
||||
}
|
||||
|
@ -55,7 +55,7 @@ namespace osu.Game.Overlays.Profile.Header
|
||||
RelativeSizeAxes = Axes.X,
|
||||
AutoSizeAxes = Axes.Y,
|
||||
Direction = FillDirection.Vertical,
|
||||
Padding = new MarginPadding { Horizontal = UserProfileOverlay.CONTENT_X_MARGIN, Vertical = 10 },
|
||||
Padding = new MarginPadding { Horizontal = WaveOverlayContainer.HORIZONTAL_PADDING, Vertical = 10 },
|
||||
Spacing = new Vector2(0, 10),
|
||||
Children = new Drawable[]
|
||||
{
|
||||
|
@ -39,7 +39,7 @@ namespace osu.Game.Overlays.Profile.Header
|
||||
RelativeSizeAxes = Axes.Y,
|
||||
Direction = FillDirection.Horizontal,
|
||||
Padding = new MarginPadding { Vertical = 10 },
|
||||
Margin = new MarginPadding { Left = UserProfileOverlay.CONTENT_X_MARGIN },
|
||||
Margin = new MarginPadding { Left = WaveOverlayContainer.HORIZONTAL_PADDING },
|
||||
Spacing = new Vector2(10, 0),
|
||||
Children = new Drawable[]
|
||||
{
|
||||
@ -62,7 +62,7 @@ namespace osu.Game.Overlays.Profile.Header
|
||||
Anchor = Anchor.CentreRight,
|
||||
Origin = Anchor.CentreRight,
|
||||
AutoSizeAxes = Axes.Both,
|
||||
Margin = new MarginPadding { Right = UserProfileOverlay.CONTENT_X_MARGIN },
|
||||
Margin = new MarginPadding { Right = WaveOverlayContainer.HORIZONTAL_PADDING },
|
||||
Children = new Drawable[]
|
||||
{
|
||||
levelBadge = new LevelBadge
|
||||
|
@ -30,7 +30,7 @@ namespace osu.Game.Overlays.Profile.Header
|
||||
{
|
||||
RelativeSizeAxes = Axes.X,
|
||||
AutoSizeAxes = Axes.Y,
|
||||
Padding = new MarginPadding { Horizontal = UserProfileOverlay.CONTENT_X_MARGIN, Vertical = 10 },
|
||||
Padding = new MarginPadding { Horizontal = WaveOverlayContainer.HORIZONTAL_PADDING, Vertical = 10 },
|
||||
Child = new GridContainer
|
||||
{
|
||||
RelativeSizeAxes = Axes.X,
|
||||
|
@ -83,7 +83,7 @@ namespace osu.Game.Overlays.Profile.Header
|
||||
Direction = FillDirection.Horizontal,
|
||||
Padding = new MarginPadding
|
||||
{
|
||||
Left = UserProfileOverlay.CONTENT_X_MARGIN,
|
||||
Left = WaveOverlayContainer.HORIZONTAL_PADDING,
|
||||
Vertical = vertical_padding
|
||||
},
|
||||
Height = content_height + 2 * vertical_padding,
|
||||
|
@ -21,7 +21,7 @@ namespace osu.Game.Overlays.Profile
|
||||
|
||||
public ProfileHeader()
|
||||
{
|
||||
ContentSidePadding = UserProfileOverlay.CONTENT_X_MARGIN;
|
||||
ContentSidePadding = WaveOverlayContainer.HORIZONTAL_PADDING;
|
||||
|
||||
TabControl.AddItem(LayoutStrings.HeaderUsersShow);
|
||||
|
||||
|
@ -67,7 +67,7 @@ namespace osu.Game.Overlays.Profile
|
||||
AutoSizeAxes = Axes.Both,
|
||||
Margin = new MarginPadding
|
||||
{
|
||||
Horizontal = UserProfileOverlay.CONTENT_X_MARGIN - outer_gutter_width,
|
||||
Horizontal = WaveOverlayContainer.HORIZONTAL_PADDING - outer_gutter_width,
|
||||
Top = 20,
|
||||
Bottom = 20,
|
||||
},
|
||||
@ -97,7 +97,7 @@ namespace osu.Game.Overlays.Profile
|
||||
RelativeSizeAxes = Axes.X,
|
||||
Padding = new MarginPadding
|
||||
{
|
||||
Horizontal = UserProfileOverlay.CONTENT_X_MARGIN - outer_gutter_width,
|
||||
Horizontal = WaveOverlayContainer.HORIZONTAL_PADDING - outer_gutter_width,
|
||||
Bottom = 20
|
||||
}
|
||||
},
|
||||
|
@ -54,7 +54,7 @@ namespace osu.Game.Overlays.Rankings
|
||||
Origin = Anchor.CentreLeft,
|
||||
Direction = FillDirection.Horizontal,
|
||||
Spacing = new Vector2(10, 0),
|
||||
Margin = new MarginPadding { Left = UserProfileOverlay.CONTENT_X_MARGIN },
|
||||
Margin = new MarginPadding { Left = WaveOverlayContainer.HORIZONTAL_PADDING },
|
||||
Children = new Drawable[]
|
||||
{
|
||||
new OsuSpriteText
|
||||
|
@ -63,7 +63,7 @@ namespace osu.Game.Overlays.Rankings
|
||||
{
|
||||
RelativeSizeAxes = Axes.X,
|
||||
AutoSizeAxes = Axes.Y,
|
||||
Padding = new MarginPadding { Horizontal = UserProfileOverlay.CONTENT_X_MARGIN },
|
||||
Padding = new MarginPadding { Horizontal = WaveOverlayContainer.HORIZONTAL_PADDING },
|
||||
Child = new FillFlowContainer
|
||||
{
|
||||
RelativeSizeAxes = Axes.X,
|
||||
|
@ -23,7 +23,6 @@ namespace osu.Game.Overlays.Rankings.Tables
|
||||
public abstract partial class RankingsTable<TModel> : TableContainer
|
||||
{
|
||||
protected const int TEXT_SIZE = 12;
|
||||
private const float horizontal_inset = 20;
|
||||
private const float row_height = 32;
|
||||
private const float row_spacing = 3;
|
||||
private const int items_per_page = 50;
|
||||
@ -39,7 +38,7 @@ namespace osu.Game.Overlays.Rankings.Tables
|
||||
RelativeSizeAxes = Axes.X;
|
||||
AutoSizeAxes = Axes.Y;
|
||||
|
||||
Padding = new MarginPadding { Horizontal = horizontal_inset };
|
||||
Padding = new MarginPadding { Horizontal = WaveOverlayContainer.HORIZONTAL_PADDING };
|
||||
RowSize = new Dimension(GridSizeMode.Absolute, row_height + row_spacing);
|
||||
}
|
||||
|
||||
|
@ -45,8 +45,6 @@ namespace osu.Game.Overlays
|
||||
[Resolved]
|
||||
private RulesetStore rulesets { get; set; } = null!;
|
||||
|
||||
public const float CONTENT_X_MARGIN = 50;
|
||||
|
||||
public UserProfileOverlay()
|
||||
: base(OverlayColourScheme.Pink)
|
||||
{
|
||||
@ -184,7 +182,7 @@ namespace osu.Game.Overlays
|
||||
public ProfileSectionTabControl()
|
||||
{
|
||||
Height = 40;
|
||||
Padding = new MarginPadding { Horizontal = CONTENT_X_MARGIN };
|
||||
Padding = new MarginPadding { Horizontal = HORIZONTAL_PADDING };
|
||||
TabContainer.Spacing = new Vector2(20);
|
||||
}
|
||||
|
||||
|
@ -22,6 +22,8 @@ namespace osu.Game.Overlays
|
||||
|
||||
protected override string PopInSampleName => "UI/wave-pop-in";
|
||||
|
||||
public const float HORIZONTAL_PADDING = 50;
|
||||
|
||||
protected WaveOverlayContainer()
|
||||
{
|
||||
AddInternal(Waves = new WaveContainer
|
||||
|
Loading…
Reference in New Issue
Block a user