h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 07:33:20 +08:00
Code Issues Releases Wiki Activity

Normalise overlay horizontal padding const

Browse Source
This commit is contained in:
Joseph Madamba 2023-04-02 17:11:19 -07:00
parent daf9f19b29
commit 7a0edabd5d
No known key found for this signature in database
GPG Key ID: 8B746C7BDDF0BD76
17 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Overlays/BeatmapSet/BeatmapSetHeaderContent.cs
View File

@ -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[]

2
osu.Game/Overlays/BeatmapSet/Info.cs
View File

@ -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

1
osu.Game/Overlays/BeatmapSetOverlay.cs
View File

@ -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;

4
osu.Game/Overlays/Changelog/ChangelogBuild.cs
View File

@ -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[]
{

2
osu.Game/Overlays/Changelog/ChangelogListing.cs
View File

@ -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
{

2
osu.Game/Overlays/Profile/Header/BadgeHeaderContainer.cs
View File

@ -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 },
}
};
}

2
osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
View File

@ -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[]
{

4
osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs
View File

@ -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

2
osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs
View File

@ -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,

2
osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
View File

@ -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,

2
osu.Game/Overlays/Profile/ProfileHeader.cs
View File

@ -21,7 +21,7 @@ namespace osu.Game.Overlays.Profile
public ProfileHeader()
{
ContentSidePadding = UserProfileOverlay.CONTENT_X_MARGIN;
ContentSidePadding = WaveOverlayContainer.HORIZONTAL_PADDING;
TabControl.AddItem(LayoutStrings.HeaderUsersShow);

4
osu.Game/Overlays/Profile/ProfileSection.cs
View File

@ -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
}
},

2
osu.Game/Overlays/Rankings/CountryFilter.cs
View File

@ -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

2
osu.Game/Overlays/Rankings/SpotlightSelector.cs
View File

@ -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,

3
osu.Game/Overlays/Rankings/Tables/RankingsTable.cs
View File

@ -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);
}

4
osu.Game/Overlays/UserProfileOverlay.cs
View File

@ -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);
}

2
osu.Game/Overlays/WaveOverlayContainer.cs
View File

@ -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