h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-14 19:22:56 +08:00
Code Issues Releases Wiki Activity

Adjust positioning and paddings

Browse Source
This commit is contained in:
smoogipoo 2021-08-12 18:02:00 +09:00
parent 3b7aa262d5
commit b75c20fee4
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Screens/OnlinePlay/Header.cs
View File

@ -32,7 +32,7 @@ namespace osu.Game.Screens.OnlinePlay
Child = title = new MultiHeaderTitle(mainTitle) Child = title = new MultiHeaderTitle(mainTitle)
{ {
Anchor = Anchor.CentreLeft, Anchor = Anchor.CentreLeft,
Origin = Anchor.BottomLeft, Origin = Anchor.CentreLeft,
}; };
stack.ScreenPushed += (_, __) => updateSubScreenTitle(); stack.ScreenPushed += (_, __) => updateSubScreenTitle();

2
osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
View File

@ -61,6 +61,8 @@ namespace osu.Game.Screens.OnlinePlay.Match
protected RoomSubScreen() protected RoomSubScreen()
{ {
Padding = new MarginPadding { Top = Header.HEIGHT };
AddRangeInternal(new Drawable[] AddRangeInternal(new Drawable[]
{ {
BeatmapAvailabilityTracker = new OnlinePlayBeatmapAvailabilityTracker BeatmapAvailabilityTracker = new OnlinePlayBeatmapAvailabilityTracker

2
osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
View File

@ -59,6 +59,8 @@ namespace osu.Game.Screens.OnlinePlay
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load() private void load()
{ {
LeftArea.Padding = new MarginPadding { Top = Header.HEIGHT };
initialBeatmap = Beatmap.Value; initialBeatmap = Beatmap.Value;
initialRuleset = Ruleset.Value; initialRuleset = Ruleset.Value;
initialMods = Mods.Value.ToList(); initialMods = Mods.Value.ToList();

9
osu.Game/Screens/Select/SongSelect.cs
View File

@ -79,6 +79,8 @@ namespace osu.Game.Screens.Select
protected BeatmapCarousel Carousel { get; private set; } protected BeatmapCarousel Carousel { get; private set; }
protected Container LeftArea { get; private set; }
private BeatmapInfoWedge beatmapInfoWedge; private BeatmapInfoWedge beatmapInfoWedge;
private DialogOverlay dialogOverlay; private DialogOverlay dialogOverlay;
@ -186,12 +188,12 @@ namespace osu.Game.Screens.Select
{ {
new Drawable[] new Drawable[]
{ {
new Container LeftArea = new Container
{ {
Origin = Anchor.BottomLeft, Origin = Anchor.BottomLeft,
Anchor = Anchor.BottomLeft, Anchor = Anchor.BottomLeft,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Padding = new MarginPadding { Top = left_area_padding },
Children = new Drawable[] Children = new Drawable[]
{ {
beatmapInfoWedge = new BeatmapInfoWedge beatmapInfoWedge = new BeatmapInfoWedge
@ -200,7 +202,6 @@ namespace osu.Game.Screens.Select
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Margin = new MarginPadding Margin = new MarginPadding
{ {
Top = left_area_padding,
Right = left_area_padding, Right = left_area_padding,
}, },
}, },
@ -210,7 +211,7 @@ namespace osu.Game.Screens.Select
Padding = new MarginPadding Padding = new MarginPadding
{ {
Bottom = Footer.HEIGHT, Bottom = Footer.HEIGHT,
Top = WEDGE_HEIGHT + left_area_padding, Top = WEDGE_HEIGHT,
Left = left_area_padding, Left = left_area_padding,
Right = left_area_padding * 2, Right = left_area_padding * 2,
}, },