sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-03 06:36:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into user-profile/ruleset-switching

Browse Source
This commit is contained in:
Bartłomiej Dach
2023-01-11 19:11:40 +01:00
parent a124c967df 8e022ad4f9
commit 52eabbf224
154 changed files with 1850 additions and 711 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +20,7 @@ namespace osu.Game.Overlays.Profile
{
private UserCoverBackground coverContainer = null!;
public Bindable<UserProfile?> UserProfile = new Bindable<UserProfile?>();
public Bindable<UserProfileData?> User = new Bindable<UserProfileData?>();
private CentreHeaderContainer centreHeaderContainer;
private DetailHeaderContainer detailHeaderContainer;
@ -29,7 +29,7 @@ namespace osu.Game.Overlays.Profile
{
ContentSidePadding = UserProfileOverlay.CONTENT_X_MARGIN;
UserProfile.ValueChanged += e => updateDisplay(e.NewValue);
User.ValueChanged += e => updateDisplay(e.NewValue);
TabControl.AddItem(LayoutStrings.HeaderUsersShow);
@ -40,7 +40,7 @@ namespace osu.Game.Overlays.Profile
{
Anchor = Anchor.CentreRight,
Origin = Anchor.CentreRight,
UserProfile = { BindTarget = UserProfile }
User = { BindTarget = User }
});
// Haphazardly guaranteed by OverlayHeader constructor (see CreateBackground / CreateContent).
@ -80,34 +80,34 @@ namespace osu.Game.Overlays.Profile
new TopHeaderContainer
{
RelativeSizeAxes = Axes.X,
UserProfile = { BindTarget = UserProfile },
User = { BindTarget = User },
},
centreHeaderContainer = new CentreHeaderContainer
{
RelativeSizeAxes = Axes.X,
UserProfile = { BindTarget = UserProfile },
User = { BindTarget = User },
},
detailHeaderContainer = new DetailHeaderContainer
{
RelativeSizeAxes = Axes.X,
UserProfile = { BindTarget = UserProfile },
User = { BindTarget = User },
},
new MedalHeaderContainer
{
RelativeSizeAxes = Axes.X,
UserProfile = { BindTarget = UserProfile },
User = { BindTarget = User },
},
new BottomHeaderContainer
{
RelativeSizeAxes = Axes.X,
UserProfile = { BindTarget = UserProfile },
User = { BindTarget = User },
},
}
};
protected override OverlayTitle CreateTitle() => new ProfileHeaderTitle();
private void updateDisplay(UserProfile? userProfile) => coverContainer.User = userProfile?.User;
private void updateDisplay(UserProfileData? user) => coverContainer.User = user?.User;
private partial class ProfileHeaderTitle : OverlayTitle
{