h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-05-19 00:30:19 +08:00
Code Issues Releases Wiki Activity

Show multiplayer/playlist header content inside title wedge (#37089)

Browse Source 
Closes https://github.com/ppy/osu/issues/37077.

| Before | After |
| :---: | :---: |
| <img width="708" height="415" alt="osu! 2026-03-25 at 05 52 30"
src="https://github.com/user-attachments/assets/1f73ac97-3f7e-4e38-89ec-b3a9bea96211"
/> | <img width="708" height="415" alt="osu! 2026-03-25 at 05 51 31"
src="https://github.com/user-attachments/assets/9d8c44a1-c3d8-4766-b9d9-1d9fda2c884f"
/> |
This commit is contained in:
Dean Herbert
2026-03-25 15:56:50 +09:00
committed by GitHub
Unverified
parent 021e4485c2
commit 98debc8d44
4 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
+1 -1
View File
@@ -83,7 +83,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
initialItem = itemToEdit ?? room.Playlist.LastOrDefault();
Padding = new MarginPadding { Horizontal = HORIZONTAL_OVERFLOW_PADDING };
LeftPadding = new MarginPadding { Top = CORNER_RADIUS_HIDE_OFFSET + Header.HEIGHT };
TopPadding = Header.HEIGHT - 10;
freeModSelect = new FreeModSelectOverlay
{
osu.Game/Screens/OnlinePlay/Playlists/PlaylistsSongSelect.cs
+1 -1
View File
@@ -51,7 +51,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
ShowOsuLogo = false;
Padding = new MarginPadding { Horizontal = HORIZONTAL_OVERFLOW_PADDING };
LeftPadding = new MarginPadding { Top = CORNER_RADIUS_HIDE_OFFSET + Header.HEIGHT };
TopPadding = Header.HEIGHT - 10;
addToPlaylistFooterButton = new AddToPlaylistFooterButton
{
osu.Game/Screens/Select/BeatmapTitleWedge.cs
+3 -1
View File
@@ -46,6 +46,8 @@ namespace osu.Game.Screens.Select
[Resolved]
private IBindable<SongSelect.BeatmapSetLookupResult?> onlineLookupResult { get; set; } = null!;
public float TopPadding { get; init; }
protected override bool StartHidden => true;
private ModSettingChangeTracker? settingChangeTracker;
@@ -97,7 +99,7 @@ namespace osu.Game.Screens.Select
Direction = FillDirection.Vertical,
Padding = new MarginPadding
{
Top = SongSelect.WEDGE_CONTENT_MARGIN,
Top = SongSelect.WEDGE_CONTENT_MARGIN + TopPadding,
Left = SongSelect.WEDGE_CONTENT_MARGIN
},
Spacing = new Vector2(0f, 4f),
osu.Game/Screens/Select/SongSelect.cs
+9 -3
View File
@@ -99,7 +99,11 @@ namespace osu.Game.Screens.Select
/// </summary>
protected bool ShowOsuLogo { get; init; } = true;
protected MarginPadding LeftPadding { get; init; }
/// <summary>
/// Additional padding to be added to the title wedge.
/// Generally set to show external content in this space.
/// </summary>
public float TopPadding { get; init; }
private ModSelectOverlay modSelectOverlay = null!;
private ModSpeedHotkeyHandler modSpeedHotkeyHandler = null!;
@@ -233,10 +237,12 @@ namespace osu.Game.Screens.Select
RelativeSizeAxes = Axes.Both,
Spacing = new Vector2(0f, 4f),
Direction = FillDirection.Vertical,
Padding = LeftPadding,
Children = new Drawable[]
{
new ShearAligningWrapper(titleWedge = new BeatmapTitleWedge()),
new ShearAligningWrapper(titleWedge = new BeatmapTitleWedge
{
TopPadding = TopPadding,
}),
new ShearAligningWrapper(detailsArea = new BeatmapDetailsArea()),
},
},